Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
f5bbeaf0
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f5bbeaf0
编写于
3月 29, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
for #660: refactor object in jaxb to XxxAssert
上级
9bb11ee4
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
111 addition
and
97 deletion
+111
-97
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserAssertHelper.java
...bc/core/parsing/integrate/asserts/ParserAssertHelper.java
+51
-39
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
...jdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
+13
-11
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/condition/ConditionAssert.java
...ore/parsing/integrate/jaxb/condition/ConditionAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/groupby/GroupByColumnAssert.java
...e/parsing/integrate/jaxb/groupby/GroupByColumnAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/item/AggregationSelectItemAssert.java
...sing/integrate/jaxb/item/AggregationSelectItemAssert.java
+2
-2
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/limit/LimitAssert.java
...ngjdbc/core/parsing/integrate/jaxb/limit/LimitAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/orderby/OrderByColumnAssert.java
...e/parsing/integrate/jaxb/orderby/OrderByColumnAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
...ngjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
+31
-31
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/table/TableAssert.java
...ngjdbc/core/parsing/integrate/jaxb/table/TableAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/GeneratedKeyTokenAssert.java
...parsing/integrate/jaxb/token/GeneratedKeyTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/IndexTokenAssert.java
...c/core/parsing/integrate/jaxb/token/IndexTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/ItemsTokenAssert.java
...c/core/parsing/integrate/jaxb/token/ItemsTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/MultipleInsertValuesTokenAssert.java
...integrate/jaxb/token/MultipleInsertValuesTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OffsetTokenAssert.java
.../core/parsing/integrate/jaxb/token/OffsetTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OrderByTokenAssert.java
...core/parsing/integrate/jaxb/token/OrderByTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/RowCountTokenAssert.java
...ore/parsing/integrate/jaxb/token/RowCountTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/SQLTokenAssert.java
...dbc/core/parsing/integrate/jaxb/token/SQLTokenAssert.java
+1
-1
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/TableTokenAssert.java
...c/core/parsing/integrate/jaxb/token/TableTokenAssert.java
+1
-1
未找到文件。
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserAssertHelper.java
浏览文件 @
f5bbeaf0
...
...
@@ -19,14 +19,27 @@ package io.shardingjdbc.core.parsing.integrate.asserts;
import
io.shardingjdbc.core.constant.DatabaseType
;
import
io.shardingjdbc.core.constant.ShardingOperator
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Value
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Table
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.limit.LimitAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.TableAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.GeneratedKeyTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.IndexTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.ItemsTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.MultipleInsertValuesTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OffsetTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OrderByTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.RowCountTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.SQLTokenAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.TableTokenAssert
;
import
io.shardingjdbc.core.parsing.parser.context.OrderItem
;
import
io.shardingjdbc.core.parsing.parser.context.condition.Column
;
import
io.shardingjdbc.core.parsing.parser.context.condition.Condition
;
import
io.shardingjdbc.core.parsing.parser.context.condition.Conditions
;
import
io.shardingjdbc.core.parsing.parser.context.limit.Limit
;
import
io.shardingjdbc.core.parsing.parser.context.limit.LimitValue
;
import
io.shardingjdbc.core.parsing.parser.context.selectitem.AggregationSelectItem
;
import
io.shardingjdbc.core.parsing.parser.context.table.Tables
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLNumberExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLPlaceholderExpression
;
...
...
@@ -53,21 +66,21 @@ import static org.junit.Assert.assertTrue;
public
class
ParserAssertHelper
{
public
static
void
assertTables
(
final
List
<
Table
>
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
table
.
Tables
actual
)
{
public
static
void
assertTables
(
final
List
<
Table
Assert
>
expected
,
final
Tables
actual
)
{
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
ParserJAXBHelper
.
getTables
(
expected
),
actual
));
}
public
static
void
assertConditions
(
final
List
<
Condition
>
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
actual
,
final
boolean
isPreparedStatement
)
{
final
List
<
Condition
Assert
>
expected
,
final
Conditions
actual
,
final
boolean
isPreparedStatement
)
{
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
buildExpectedConditions
(
expected
,
isPreparedStatement
),
actual
));
}
private
static
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
buildExpectedConditions
(
final
List
<
Condition
>
conditions
,
final
boolean
isPreparedStatement
)
{
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
result
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
();
private
static
Conditions
buildExpectedConditions
(
final
List
<
ConditionAssert
>
conditions
,
final
boolean
isPreparedStatement
)
{
Conditions
result
=
new
Conditions
();
if
(
null
==
conditions
)
{
return
result
;
}
for
(
Condition
each
:
conditions
)
{
for
(
Condition
Assert
each
:
conditions
)
{
List
<
SQLExpression
>
sqlExpressions
=
new
LinkedList
<>();
for
(
Value
value
:
each
.
getValues
())
{
if
(
isPreparedStatement
)
{
...
...
@@ -81,17 +94,16 @@ public class ParserAssertHelper {
}
}
}
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Condition
condition
;
Condition
condition
;
switch
(
ShardingOperator
.
valueOf
(
each
.
getOperator
().
toUpperCase
()))
{
case
EQUAL:
condition
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
.
get
(
0
));
condition
=
new
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
.
get
(
0
));
break
;
case
BETWEEN:
condition
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
.
get
(
0
),
sqlExpressions
.
get
(
1
));
condition
=
new
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
.
get
(
0
),
sqlExpressions
.
get
(
1
));
break
;
case
IN:
condition
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
);
condition
=
new
Condition
(
new
Column
(
each
.
getColumnName
(),
each
.
getTableName
()),
sqlExpressions
);
break
;
default
:
throw
new
UnsupportedOperationException
();
...
...
@@ -101,7 +113,7 @@ public class ParserAssertHelper {
return
result
;
}
public
static
void
assertSqlTokens
(
final
List
<
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
SQLToken
>
expected
,
final
List
<
SQLToken
>
actual
,
final
boolean
isPreparedStatement
)
{
public
static
void
assertSqlTokens
(
final
List
<
SQLTokenAssert
>
expected
,
final
List
<
SQLToken
>
actual
,
final
boolean
isPreparedStatement
)
{
if
(
null
==
expected
||
expected
.
size
()
==
0
)
{
return
;
}
...
...
@@ -119,12 +131,12 @@ public class ParserAssertHelper {
}
}
private
static
List
<
SQLToken
>
buildExpectedSqlTokens
(
final
List
<
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
SQLToken
>
sqlTokens
,
private
static
List
<
SQLToken
>
buildExpectedSqlTokens
(
final
List
<
SQLTokenAssert
>
sqlTokens
,
final
boolean
isPreparedStatement
)
{
List
<
SQLToken
>
result
=
new
ArrayList
<>(
sqlTokens
.
size
());
for
(
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
SQLToken
each
:
sqlTokens
)
{
if
(
isPreparedStatement
&&
(
each
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OffsetToken
||
each
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
RowCountToken
))
{
for
(
SQLTokenAssert
each
:
sqlTokens
)
{
if
(
isPreparedStatement
&&
(
each
instanceof
OffsetTokenAssert
||
each
instanceof
RowCountTokenAssert
))
{
continue
;
}
result
.
add
(
buildExpectedSQLToken
(
each
,
isPreparedStatement
));
...
...
@@ -132,42 +144,42 @@ public class ParserAssertHelper {
return
result
;
}
private
static
SQLToken
buildExpectedSQLToken
(
final
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
SQLToken
sqlToken
,
final
boolean
isPreparedStatement
)
{
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
TableToken
)
{
return
new
TableToken
(
sqlToken
.
getBeginPosition
(),
((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
TableToken
)
sqlToken
).
getOriginalLiterals
());
private
static
SQLToken
buildExpectedSQLToken
(
final
SQLTokenAssert
sqlToken
,
final
boolean
isPreparedStatement
)
{
if
(
sqlToken
instanceof
TableTokenAssert
)
{
return
new
TableToken
(
sqlToken
.
getBeginPosition
(),
((
TableTokenAssert
)
sqlToken
).
getOriginalLiterals
());
}
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
IndexToken
)
{
return
new
IndexToken
(
sqlToken
.
getBeginPosition
(),
((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
IndexToken
)
sqlToken
).
getOriginalLiterals
(),
((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
IndexToken
)
sqlToken
).
getTableName
());
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
ItemsToken
)
{
if
(
sqlToken
instanceof
IndexTokenAssert
)
{
return
new
IndexToken
(
sqlToken
.
getBeginPosition
(),
((
IndexTokenAssert
)
sqlToken
).
getOriginalLiterals
(),
((
IndexTokenAssert
)
sqlToken
).
getTableName
());
}
else
if
(
sqlToken
instanceof
ItemsTokenAssert
)
{
ItemsToken
itemsToken
=
new
ItemsToken
(
sqlToken
.
getBeginPosition
());
itemsToken
.
getItems
().
addAll
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
ItemsToken
)
sqlToken
).
getItems
());
itemsToken
.
getItems
().
addAll
(((
ItemsTokenAssert
)
sqlToken
).
getItems
());
return
itemsToken
;
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
GeneratedKeyToken
)
{
}
else
if
(
sqlToken
instanceof
GeneratedKeyTokenAssert
)
{
if
(
isPreparedStatement
)
{
return
new
GeneratedKeyToken
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
GeneratedKeyToken
)
sqlToken
).
getBeginPositionOfPreparedStatement
());
return
new
GeneratedKeyToken
(((
GeneratedKeyTokenAssert
)
sqlToken
).
getBeginPositionOfPreparedStatement
());
}
else
{
return
new
GeneratedKeyToken
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
GeneratedKeyToken
)
sqlToken
).
getBeginPositionOfStatement
());
return
new
GeneratedKeyToken
(((
GeneratedKeyTokenAssert
)
sqlToken
).
getBeginPositionOfStatement
());
}
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
MultipleInsertValuesToken
)
{
}
else
if
(
sqlToken
instanceof
MultipleInsertValuesTokenAssert
)
{
MultipleInsertValuesToken
multipleInsertValuesToken
=
new
MultipleInsertValuesToken
(
sqlToken
.
getBeginPosition
());
multipleInsertValuesToken
.
getValues
().
addAll
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
MultipleInsertValuesToken
)
sqlToken
).
getValues
());
multipleInsertValuesToken
.
getValues
().
addAll
(((
MultipleInsertValuesTokenAssert
)
sqlToken
).
getValues
());
return
multipleInsertValuesToken
;
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
RowCountToken
)
{
return
new
RowCountToken
(
sqlToken
.
getBeginPosition
(),
((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
RowCountToken
)
sqlToken
).
getRowCount
());
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OrderByToken
)
{
}
else
if
(
sqlToken
instanceof
RowCountTokenAssert
)
{
return
new
RowCountToken
(
sqlToken
.
getBeginPosition
(),
((
RowCountTokenAssert
)
sqlToken
).
getRowCount
());
}
else
if
(
sqlToken
instanceof
OrderByTokenAssert
)
{
if
(
isPreparedStatement
)
{
return
new
OrderByToken
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OrderByToken
)
sqlToken
).
getBeginPositionOfPreparedStatement
());
return
new
OrderByToken
(((
OrderByTokenAssert
)
sqlToken
).
getBeginPositionOfPreparedStatement
());
}
else
{
return
new
OrderByToken
(((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OrderByToken
)
sqlToken
).
getBeginPositionOfStatement
());
return
new
OrderByToken
(((
OrderByTokenAssert
)
sqlToken
).
getBeginPositionOfStatement
());
}
}
else
if
(
sqlToken
instanceof
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OffsetToken
)
{
return
new
OffsetToken
(
sqlToken
.
getBeginPosition
(),
((
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
token
.
OffsetToken
)
sqlToken
).
getOffset
());
}
else
if
(
sqlToken
instanceof
OffsetTokenAssert
)
{
return
new
OffsetToken
(
sqlToken
.
getBeginPosition
(),
((
OffsetTokenAssert
)
sqlToken
).
getOffset
());
}
return
null
;
}
public
static
void
assertLimit
(
final
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
limit
.
Limi
t
limit
,
final
Limit
actual
,
final
boolean
isPreparedStatement
)
{
public
static
void
assertLimit
(
final
LimitAsser
t
limit
,
final
Limit
actual
,
final
boolean
isPreparedStatement
)
{
Limit
expected
=
buildExpectedLimit
(
limit
,
isPreparedStatement
);
if
(
null
==
expected
)
{
assertNull
(
actual
);
...
...
@@ -181,7 +193,7 @@ public class ParserAssertHelper {
}
}
private
static
Limit
buildExpectedLimit
(
final
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
limit
.
Limi
t
limit
,
final
boolean
isPreparedStatement
)
{
private
static
Limit
buildExpectedLimit
(
final
LimitAsser
t
limit
,
final
boolean
isPreparedStatement
)
{
if
(
null
==
limit
)
{
return
null
;
}
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
浏览文件 @
f5bbeaf0
...
...
@@ -23,13 +23,15 @@ import com.google.common.base.Strings;
import
com.google.common.collect.Lists
;
import
io.shardingjdbc.core.constant.AggregationType
;
import
io.shardingjdbc.core.constant.OrderDirection
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.item.AggregationSelectItemAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.TableAssert
;
import
io.shardingjdbc.core.parsing.parser.context.OrderItem
;
import
io.shardingjdbc.core.parsing.parser.context.selectitem.AggregationSelectItem
;
import
io.shardingjdbc.core.parsing.parser.context.table.Table
;
import
io.shardingjdbc.core.parsing.parser.context.table.Tables
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.root.ParserAssert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.orderby.OrderByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumn
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.orderby.OrderByColumn
Assert
;
import
io.shardingjdbc.core.parsing.parser.sql.dql.select.SelectStatement
;
import
java.util.List
;
...
...
@@ -42,12 +44,12 @@ public final class ParserJAXBHelper {
* @param tables tables
* @return tables
*/
public
static
Tables
getTables
(
final
List
<
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Table
>
tables
)
{
public
static
Tables
getTables
(
final
List
<
TableAssert
>
tables
)
{
Tables
result
=
new
Tables
();
if
(
null
==
tables
)
{
return
result
;
}
for
(
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Table
each
:
tables
)
{
for
(
TableAssert
each
:
tables
)
{
Table
table
=
new
Table
(
each
.
getName
(),
Optional
.
fromNullable
(
each
.
getAlias
()));
result
.
add
(
table
);
}
...
...
@@ -63,10 +65,10 @@ public final class ParserJAXBHelper {
public
static
SelectStatement
getSelectStatement
(
final
ParserAssert
assertObj
)
{
final
SelectStatement
result
=
new
SelectStatement
();
if
(
null
!=
assertObj
.
getOrderByColumns
())
{
List
<
OrderItem
>
orderItems
=
Lists
.
transform
(
assertObj
.
getOrderByColumns
(),
new
Function
<
OrderByColumn
,
OrderItem
>()
{
List
<
OrderItem
>
orderItems
=
Lists
.
transform
(
assertObj
.
getOrderByColumns
(),
new
Function
<
OrderByColumn
Assert
,
OrderItem
>()
{
@Override
public
OrderItem
apply
(
final
OrderByColumn
input
)
{
public
OrderItem
apply
(
final
OrderByColumn
Assert
input
)
{
if
(
Strings
.
isNullOrEmpty
(
input
.
getName
()))
{
// TODO nullOrderType should config in xml
return
new
OrderItem
(
input
.
getIndex
(),
OrderDirection
.
valueOf
(
input
.
getOrderDirection
().
toUpperCase
()),
OrderDirection
.
ASC
);
...
...
@@ -83,10 +85,10 @@ public final class ParserJAXBHelper {
result
.
getOrderByItems
().
addAll
(
orderItems
);
}
if
(
null
!=
assertObj
.
getGroupByColumns
())
{
result
.
getGroupByItems
().
addAll
(
Lists
.
transform
(
assertObj
.
getGroupByColumns
(),
new
Function
<
GroupByColumn
,
OrderItem
>()
{
result
.
getGroupByItems
().
addAll
(
Lists
.
transform
(
assertObj
.
getGroupByColumns
(),
new
Function
<
GroupByColumn
Assert
,
OrderItem
>()
{
@Override
public
OrderItem
apply
(
final
GroupByColumn
input
)
{
public
OrderItem
apply
(
final
GroupByColumn
Assert
input
)
{
if
(
null
==
input
.
getOwner
())
{
// TODO nullOrderType should config in xml
return
new
OrderItem
(
input
.
getName
(),
OrderDirection
.
valueOf
(
input
.
getOrderDirection
().
toUpperCase
()),
OrderDirection
.
ASC
,
Optional
.
fromNullable
(
input
.
getAlias
()));
...
...
@@ -99,13 +101,13 @@ public final class ParserJAXBHelper {
}
if
(
null
!=
assertObj
.
getAggregationSelectItems
())
{
List
<
AggregationSelectItem
>
selectItems
=
Lists
.
transform
(
assertObj
.
getAggregationSelectItems
(),
new
Function
<
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
item
.
AggregationSelectItem
,
AggregationSelectItem
>()
{
new
Function
<
AggregationSelectItemAssert
,
AggregationSelectItem
>()
{
@Override
public
AggregationSelectItem
apply
(
final
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
item
.
AggregationSelectItem
input
)
{
public
AggregationSelectItem
apply
(
final
AggregationSelectItemAssert
input
)
{
AggregationSelectItem
result
=
new
AggregationSelectItem
(
AggregationType
.
valueOf
(
input
.
getAggregationType
().
toUpperCase
()),
input
.
getInnerExpression
(),
Optional
.
fromNullable
(
input
.
getAlias
()));
for
(
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
item
.
AggregationSelectItem
each
:
input
.
getDerivedColumns
())
{
for
(
AggregationSelectItemAssert
each
:
input
.
getDerivedColumns
())
{
result
.
getDerivedAggregationSelectItems
().
add
(
new
AggregationSelectItem
(
AggregationType
.
valueOf
(
each
.
getAggregationType
().
toUpperCase
()),
each
.
getInnerExpression
(),
Optional
.
fromNullable
(
each
.
getAlias
())));
}
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/condition/Condition.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/condition/Condition
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -29,7 +29,7 @@ import java.util.List;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
Condition
{
public
final
class
Condition
Assert
{
@XmlAttribute
(
name
=
"column-name"
)
private
String
columnName
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/groupby/GroupByColumn.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/groupby/GroupByColumn
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
GroupByColumn
{
public
final
class
GroupByColumn
Assert
{
@XmlAttribute
private
String
owner
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/item/AggregationSelectItem.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/item/AggregationSelectItem
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -30,7 +30,7 @@ import java.util.List;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
AggregationSelectItem
{
public
final
class
AggregationSelectItem
Assert
{
@XmlAttribute
(
name
=
"inner-expression"
)
private
String
innerExpression
;
...
...
@@ -48,5 +48,5 @@ public final class AggregationSelectItem {
private
Integer
index
;
@XmlElement
(
name
=
"derived-column"
)
private
List
<
AggregationSelectItem
>
derivedColumns
=
new
ArrayList
<>(
2
);
private
List
<
AggregationSelectItem
Assert
>
derivedColumns
=
new
ArrayList
<>(
2
);
}
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/limit/Limit.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/limit/Limit
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
Limit
{
public
final
class
Limit
Assert
{
@XmlAttribute
private
Integer
offset
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/orderby/OrderByColumn.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/orderby/OrderByColumn
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
OrderByColumn
{
public
final
class
OrderByColumn
Assert
{
@XmlAttribute
private
String
owner
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
浏览文件 @
f5bbeaf0
...
...
@@ -17,21 +17,21 @@
package
io.shardingjdbc.core.parsing.integrate.jaxb.root
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.item.AggregationSelectItem
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.limit.Limit
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.orderby.OrderByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Table
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.GeneratedKeyToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.IndexToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.ItemsToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.MultipleInsertValuesToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OffsetToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OrderByToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.RowCountToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.SQLToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.TableToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumn
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.item.AggregationSelectItem
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.limit.Limit
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.orderby.OrderByColumn
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Table
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.GeneratedKeyToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.IndexToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.ItemsToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.MultipleInsertValuesToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OffsetToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OrderByToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.RowCountToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.SQLToken
Assert
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.TableToken
Assert
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
@@ -58,59 +58,59 @@ public final class ParserAssert {
@XmlElementWrapper
@XmlElement
(
name
=
"table"
)
private
List
<
Table
>
tables
;
private
List
<
Table
Assert
>
tables
;
@XmlElementWrapper
@XmlElement
(
name
=
"condition"
)
private
List
<
Condition
>
conditions
;
private
List
<
Condition
Assert
>
conditions
;
@XmlElementWrapper
(
name
=
"table-tokens"
)
@XmlElement
(
name
=
"table-token"
)
private
List
<
TableToken
>
tableTokens
;
private
List
<
TableToken
Assert
>
tableTokens
;
@XmlElement
(
name
=
"index-token"
)
private
IndexToken
indexToken
;
private
IndexToken
Assert
indexToken
;
@XmlElement
(
name
=
"items-token"
)
private
ItemsToken
itemsToken
;
private
ItemsToken
Assert
itemsToken
;
@XmlElement
(
name
=
"generated-key-token"
)
private
GeneratedKeyToken
generatedKeyToken
;
private
GeneratedKeyToken
Assert
generatedKeyToken
;
@XmlElement
(
name
=
"multiple-insert-values-token"
)
private
MultipleInsertValuesToken
multipleInsertValuesToken
;
private
MultipleInsertValuesToken
Assert
multipleInsertValuesToken
;
@XmlElement
(
name
=
"order-by-token"
)
private
OrderByToken
orderByToken
;
private
OrderByToken
Assert
orderByToken
;
@XmlElement
(
name
=
"offset-token"
)
private
OffsetToken
offsetToken
;
private
OffsetToken
Assert
offsetToken
;
@XmlElement
(
name
=
"row-count-token"
)
private
RowCountToken
rowCountToken
;
private
RowCountToken
Assert
rowCountToken
;
@XmlElementWrapper
(
name
=
"order-by-columns"
)
@XmlElement
(
name
=
"order-by-column"
)
private
List
<
OrderByColumn
>
orderByColumns
;
private
List
<
OrderByColumn
Assert
>
orderByColumns
;
@XmlElementWrapper
(
name
=
"group-by-columns"
)
@XmlElement
(
name
=
"group-by-column"
)
private
List
<
GroupByColumn
>
groupByColumns
;
private
List
<
GroupByColumn
Assert
>
groupByColumns
;
@XmlElementWrapper
(
name
=
"aggregation-select-items"
)
@XmlElement
(
name
=
"aggregation-select-item"
)
private
List
<
AggregationSelectItem
>
aggregationSelectItems
;
private
List
<
AggregationSelectItem
Assert
>
aggregationSelectItems
;
@XmlElement
private
Limit
limit
;
private
Limit
Assert
limit
;
/**
* Get SQL tokens.
*
* @return SQL tokens
*/
public
List
<
SQLToken
>
getSqlTokens
()
{
List
<
SQLToken
>
result
=
new
ArrayList
<>(
7
);
public
List
<
SQLToken
Assert
>
getSqlTokens
()
{
List
<
SQLToken
Assert
>
result
=
new
ArrayList
<>(
7
);
if
(
null
!=
tableTokens
)
{
result
.
addAll
(
tableTokens
);
}
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/table/Table.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/table/Table
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@Getter
@Setter
public
final
class
Table
{
public
final
class
Table
Assert
{
@XmlAttribute
private
String
name
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/GeneratedKeyToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/GeneratedKeyToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
GeneratedKeyToken
extends
SQLToken
{
public
final
class
GeneratedKeyToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"begin-position-of-statement"
)
private
int
beginPositionOfStatement
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/IndexToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/IndexToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
IndexToken
extends
SQLToken
{
public
class
IndexToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"original-literals"
)
private
String
originalLiterals
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/ItemsToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/ItemsToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -30,7 +30,7 @@ import java.util.List;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ItemsToken
extends
SQLToken
{
public
class
ItemsToken
Assert
extends
SQLTokenAssert
{
@XmlElementWrapper
(
name
=
"items"
)
@XmlElement
(
name
=
"item"
)
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/MultipleInsertValuesToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/MultipleInsertValuesToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -30,7 +30,7 @@ import java.util.List;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
MultipleInsertValuesToken
extends
SQLToken
{
public
class
MultipleInsertValuesToken
Assert
extends
SQLTokenAssert
{
@XmlElementWrapper
(
name
=
"values"
)
@XmlElement
(
name
=
"value"
)
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OffsetToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OffsetToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
OffsetToken
extends
SQLToken
{
public
class
OffsetToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"offset"
)
private
int
offset
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OrderByToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OrderByToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
OrderByToken
extends
SQLToken
{
public
final
class
OrderByToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"begin-position-of-statement"
)
private
int
beginPositionOfStatement
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/RowCountToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/RowCountToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
RowCountToken
extends
SQLToken
{
public
class
RowCountToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"row-count"
)
private
int
rowCount
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/SQLToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/SQLToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
SQLToken
{
public
class
SQLToken
Assert
{
@XmlAttribute
(
name
=
"begin-position"
)
private
int
beginPosition
;
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/TableToken.java
→
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/TableToken
Assert
.java
浏览文件 @
f5bbeaf0
...
...
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
@Getter
@Setter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
TableToken
extends
SQLToken
{
public
class
TableToken
Assert
extends
SQLTokenAssert
{
@XmlAttribute
(
name
=
"original-literals"
)
private
String
originalLiterals
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录