Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
9bb11ee4
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,发现更多精彩内容 >>
提交
9bb11ee4
编写于
3月 29, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
for #660: use @XmlElementWrapper to simplify Tables and Conditions
上级
6c4eb047
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
85 deletion
+19
-85
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserAssertHelper.java
...bc/core/parsing/integrate/asserts/ParserAssertHelper.java
+6
-8
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
...jdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
+2
-2
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/condition/Conditions.java
...dbc/core/parsing/integrate/jaxb/condition/Conditions.java
+0
-33
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
...ngjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
+11
-9
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/table/Tables.java
...hardingjdbc/core/parsing/integrate/jaxb/table/Tables.java
+0
-33
未找到文件。
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserAssertHelper.java
浏览文件 @
9bb11ee4
...
@@ -20,8 +20,8 @@ package io.shardingjdbc.core.parsing.integrate.asserts;
...
@@ -20,8 +20,8 @@ package io.shardingjdbc.core.parsing.integrate.asserts;
import
io.shardingjdbc.core.constant.DatabaseType
;
import
io.shardingjdbc.core.constant.DatabaseType
;
import
io.shardingjdbc.core.constant.ShardingOperator
;
import
io.shardingjdbc.core.constant.ShardingOperator
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Condition
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.
Conditions
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.
Value
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Table
s
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Table
;
import
io.shardingjdbc.core.parsing.parser.context.OrderItem
;
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.Column
;
import
io.shardingjdbc.core.parsing.parser.context.limit.Limit
;
import
io.shardingjdbc.core.parsing.parser.context.limit.Limit
;
...
@@ -31,7 +31,6 @@ import io.shardingjdbc.core.parsing.parser.expression.SQLExpression;
...
@@ -31,7 +31,6 @@ import io.shardingjdbc.core.parsing.parser.expression.SQLExpression;
import
io.shardingjdbc.core.parsing.parser.expression.SQLNumberExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLNumberExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLPlaceholderExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLPlaceholderExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLTextExpression
;
import
io.shardingjdbc.core.parsing.parser.expression.SQLTextExpression
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Value
;
import
io.shardingjdbc.core.parsing.parser.token.GeneratedKeyToken
;
import
io.shardingjdbc.core.parsing.parser.token.GeneratedKeyToken
;
import
io.shardingjdbc.core.parsing.parser.token.IndexToken
;
import
io.shardingjdbc.core.parsing.parser.token.IndexToken
;
import
io.shardingjdbc.core.parsing.parser.token.ItemsToken
;
import
io.shardingjdbc.core.parsing.parser.token.ItemsToken
;
...
@@ -54,22 +53,21 @@ import static org.junit.Assert.assertTrue;
...
@@ -54,22 +53,21 @@ import static org.junit.Assert.assertTrue;
public
class
ParserAssertHelper
{
public
class
ParserAssertHelper
{
public
static
void
assertTables
(
final
Tables
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
table
.
Tables
actual
)
{
public
static
void
assertTables
(
final
List
<
Table
>
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
table
.
Tables
actual
)
{
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
ParserJAXBHelper
.
getTables
(
expected
),
actual
));
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
ParserJAXBHelper
.
getTables
(
expected
),
actual
));
}
}
public
static
void
assertConditions
(
public
static
void
assertConditions
(
final
Conditions
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
actual
,
final
boolean
isPreparedStatement
)
{
final
List
<
Condition
>
expected
,
final
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
actual
,
final
boolean
isPreparedStatement
)
{
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
buildExpectedConditions
(
expected
,
isPreparedStatement
),
actual
));
assertTrue
(
EqualsBuilder
.
reflectionEquals
(
buildExpectedConditions
(
expected
,
isPreparedStatement
),
actual
));
}
}
private
static
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
buildExpectedConditions
(
private
static
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
buildExpectedConditions
(
final
List
<
Condition
>
conditions
,
final
boolean
isPreparedStatement
)
{
final
Conditions
conditions
,
final
boolean
isPreparedStatement
)
{
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
result
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
();
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
result
=
new
io
.
shardingjdbc
.
core
.
parsing
.
parser
.
context
.
condition
.
Conditions
();
if
(
null
==
conditions
)
{
if
(
null
==
conditions
)
{
return
result
;
return
result
;
}
}
for
(
Condition
each
:
conditions
.
getConditions
()
)
{
for
(
Condition
each
:
conditions
)
{
List
<
SQLExpression
>
sqlExpressions
=
new
LinkedList
<>();
List
<
SQLExpression
>
sqlExpressions
=
new
LinkedList
<>();
for
(
Value
value
:
each
.
getValues
())
{
for
(
Value
value
:
each
.
getValues
())
{
if
(
isPreparedStatement
)
{
if
(
isPreparedStatement
)
{
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserJAXBHelper.java
浏览文件 @
9bb11ee4
...
@@ -42,12 +42,12 @@ public final class ParserJAXBHelper {
...
@@ -42,12 +42,12 @@ public final class ParserJAXBHelper {
* @param tables tables
* @param tables tables
* @return tables
* @return tables
*/
*/
public
static
Tables
getTables
(
final
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Tables
tables
)
{
public
static
Tables
getTables
(
final
List
<
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Table
>
tables
)
{
Tables
result
=
new
Tables
();
Tables
result
=
new
Tables
();
if
(
null
==
tables
)
{
if
(
null
==
tables
)
{
return
result
;
return
result
;
}
}
for
(
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Table
each
:
tables
.
getTables
()
)
{
for
(
io
.
shardingjdbc
.
core
.
parsing
.
integrate
.
jaxb
.
table
.
Table
each
:
tables
)
{
Table
table
=
new
Table
(
each
.
getName
(),
Optional
.
fromNullable
(
each
.
getAlias
()));
Table
table
=
new
Table
(
each
.
getName
(),
Optional
.
fromNullable
(
each
.
getAlias
()));
result
.
add
(
table
);
result
.
add
(
table
);
}
}
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/condition/Conditions.java
已删除
100644 → 0
浏览文件 @
6c4eb047
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* </p>
*/
package
io.shardingjdbc.core.parsing.integrate.jaxb.condition
;
import
lombok.Getter
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlElement
;
import
java.util.List
;
@Getter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
Conditions
{
@XmlElement
(
name
=
"condition"
)
private
List
<
Condition
>
conditions
;
}
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/root/ParserAssert.java
浏览文件 @
9bb11ee4
...
@@ -17,21 +17,21 @@
...
@@ -17,21 +17,21 @@
package
io.shardingjdbc.core.parsing.integrate.jaxb.root
;
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.item.AggregationSelectItem
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.condition.Conditions
;
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.GeneratedKeyToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.IndexToken
;
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.ItemsToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.limit.Limit
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.MultipleInsertValuesToken
;
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.OffsetToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.orderby.OrderByColumn
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.OrderByToken
;
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.RowCountToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.token.SQLToken
;
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.token.TableToken
;
import
io.shardingjdbc.core.parsing.integrate.jaxb.table.Tables
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
@@ -56,11 +56,13 @@ public final class ParserAssert {
...
@@ -56,11 +56,13 @@ public final class ParserAssert {
@XmlList
@XmlList
private
List
<
String
>
parameters
;
private
List
<
String
>
parameters
;
@XmlElement
(
name
=
"tables"
)
@XmlElementWrapper
private
Tables
tables
;
@XmlElement
(
name
=
"table"
)
private
List
<
Table
>
tables
;
@XmlElement
(
name
=
"conditions"
)
@XmlElementWrapper
private
Conditions
conditions
;
@XmlElement
(
name
=
"condition"
)
private
List
<
Condition
>
conditions
;
@XmlElementWrapper
(
name
=
"table-tokens"
)
@XmlElementWrapper
(
name
=
"table-tokens"
)
@XmlElement
(
name
=
"table-token"
)
@XmlElement
(
name
=
"table-token"
)
...
...
sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/table/Tables.java
已删除
100644 → 0
浏览文件 @
6c4eb047
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* </p>
*/
package
io.shardingjdbc.core.parsing.integrate.jaxb.table
;
import
lombok.Getter
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlElement
;
import
java.util.List
;
@Getter
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
final
class
Tables
{
@XmlElement
(
name
=
"table"
)
private
List
<
Table
>
tables
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录