You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/11/19 14:26:34 UTC
[shardingsphere] branch master updated: Remove unnecessary xml jaxb declaration (#22279)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new fceec389bc2 Remove unnecessary xml jaxb declaration (#22279)
fceec389bc2 is described below
commit fceec389bc24f26bfcbdef22ebed6b2a78901eab
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 19 22:26:26 2022 +0800
Remove unnecessary xml jaxb declaration (#22279)
* Refactor package structure of parser cases
* Refactor package structure of parser cases
---
.../asserts/segment/database/DatabaseAssert.java | 2 +-
.../asserts/segment/distsql/DatabaseAssert.java | 2 +-
.../impl/assignment/ExpectedAssignment.java | 2 +-
.../impl/assignment/ExpectedAssignmentValue.java | 6 +--
.../segment/impl/call/ExpectedProcedureName.java | 2 +-
.../impl/call/ExpectedProcedureParameters.java | 4 +-
.../segment/impl/clone/ExpectedDataDirectory.java | 4 +-
.../segment/impl/clone/ExpectedInstance.java | 10 +++--
.../segment/impl/component/ExpectedComponent.java | 2 -
.../segment/impl/cursor/ExpectedCursorName.java | 4 --
.../impl/cursor/ExpectedDirectionSegment.java | 2 +-
.../{schema => database}/ExpectedDatabase.java | 8 +---
.../definition/ExpectedChangeColumnDefinition.java | 2 +-
.../segment/impl/distsql/ExpectedDataSource.java | 2 +-
.../impl/distsql/ExpectedSQLParserRule.java | 2 +-
.../impl/distsql/rdl/ExpectedEncryptColumn.java | 2 +-
.../impl/distsql/rdl/ExpectedEncryptRule.java | 2 +-
.../impl/distsql/rdl/ExpectedShadowRule.java | 6 +--
.../impl/distsql/rdl/ExpectedShardingStrategy.java | 2 +-
.../impl/expr/ExpectedBetweenExpression.java | 4 +-
.../expr/ExpectedBinaryOperationExpression.java | 6 +--
.../segment/impl/expr/ExpectedExistsSubquery.java | 4 +-
.../segment/impl/expr/ExpectedExpression.java | 6 +--
.../segment/impl/expr/ExpectedInExpression.java | 6 +--
.../segment/impl/expr/ExpectedListExpression.java | 6 +--
.../segment/impl/expr/ExpectedNotExpression.java | 2 +-
.../segment/impl/from/ExpectedFromSchema.java | 4 +-
.../segment/impl/function/ExpectedFunction.java | 2 +-
.../domain/segment/impl/group/ExpectedGroup.java | 4 --
.../segment/impl/having/ExpectedHavingClause.java | 2 +-
.../impl/index/ExpectedCacheTableIndex.java | 2 +-
.../segment/impl/index/ExpectedLoadTableIndex.java | 2 +-
.../impl/index/ExpectedPartitionDefinition.java | 2 +-
.../impl/insert/ExpectedInsertColumnsClause.java | 2 +-
.../insert/ExpectedInsertMultiTableElement.java | 2 +-
.../impl/insert/ExpectedInsertValuesClause.java | 2 +-
.../impl/insert/ExpectedOnDuplicateKeyColumns.java | 2 +-
.../segment/impl/like/ExpectedLikeClause.java | 2 +-
.../impl/limit/ExpectedPaginationValue.java | 5 ++-
.../segment/impl/lock/ExpectedLockClause.java | 2 -
.../domain/segment/impl/login/ExpectedLogin.java | 4 --
.../item/impl/ExpectedExpressionOrderByItem.java | 2 +-
.../domain/segment/impl/plugin/ExpectedPlugin.java | 2 -
.../impl/projection/ExpectedProjection.java | 3 ++
.../impl/projection/ExpectedProjections.java | 2 +-
.../ExpectedAggregationDistinctProjection.java | 3 ++
.../aggregation/ExpectedAggregationProjection.java | 5 ++-
.../impl/column/ExpectedColumnProjection.java | 3 ++
.../expression/ExpectedExpressionProjection.java | 9 ++--
.../shorthand/ExpectedShorthandProjection.java | 3 ++
.../projection/impl/top/ExpectedTopProjection.java | 5 ++-
.../impl/reset/ExpectedResetOptionSegment.java | 8 ++--
.../segment/impl/show/ExpectedShowFilter.java | 6 ++-
.../segment/impl/table/ExpectedJoinTable.java | 4 +-
.../domain/segment/impl/user/ExpectedUser.java | 2 +-
.../segment/impl/where/ExpectedWhereClause.java | 2 +-
.../segment/impl/window/ExpectedWindowClause.java | 4 --
.../statement/DatabaseContainedTestCase.java | 2 +-
.../parser/domain/statement/SQLParserTestCase.java | 2 +-
.../dal/ShowColumnsStatementTestCase.java | 2 +-
.../statement/dal/ShowIndexStatementTestCase.java | 2 +-
.../domain/statement/dal/UseStatementTestCase.java | 2 +-
.../src/main/resources/case/ddl/alter-table.xml | 51 +++++++++++-----------
.../src/main/resources/case/ral/updatable.xml | 2 +-
test/parser/src/main/resources/case/rdl/alter.xml | 2 +-
test/parser/src/main/resources/case/rdl/create.xml | 4 +-
66 files changed, 138 insertions(+), 133 deletions(-)
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
index b1dc2f0faa8..d408e6e16a3 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseS
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
/**
* Database assert.
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
index 7d0fd48158c..117dca3b237 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
/**
* Database assert.
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignment.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignment.java
index a5ba4314e2d..3a2b4a496c2 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignment.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignment.java
@@ -35,7 +35,7 @@ public final class ExpectedAssignment extends AbstractExpectedSQLSegment {
@XmlElement
private ExpectedColumn column;
- @XmlElement(name = "columns")
+ @XmlElement
private List<ExpectedColumn> columns;
@XmlElement(name = "assignment-value")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignmentValue.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignmentValue.java
index 1cc4ffc4a24..7728d9317bf 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignmentValue.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/assignment/ExpectedAssignmentValue.java
@@ -45,12 +45,12 @@ public final class ExpectedAssignmentValue extends AbstractExpectedSQLSegment {
@XmlElement(name = "common-expression")
private ExpectedCommonExpression commonExpression;
- @XmlElement(name = "column")
+ @XmlElement
private ExpectedColumn column;
- @XmlElement(name = "subquery")
+ @XmlElement
private ExpectedSubquery subquery;
- @XmlElement(name = "function")
+ @XmlElement
private ExpectedFunction function;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureName.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureName.java
index ad5083ed56f..1c2f3218b88 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureName.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureName.java
@@ -30,6 +30,6 @@ import javax.xml.bind.annotation.XmlAttribute;
@Setter
public final class ExpectedProcedureName extends AbstractExpectedSQLSegment {
- @XmlAttribute(name = "name")
+ @XmlAttribute
private String name;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java
index b8c0f0f828a..cb221cd177b 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.call;
import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlElement;
@@ -29,9 +28,8 @@ import java.util.List;
* Expected procedure parameters.
*/
@Getter
-@Setter
public final class ExpectedProcedureParameters extends AbstractExpectedSQLSegment {
@XmlElement(name = "parameter")
- private List<ExpectedCallParameter> parameters = new LinkedList<>();
+ private final List<ExpectedCallParameter> parameters = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedDataDirectory.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedDataDirectory.java
index 7d068cc0640..07426a86d8c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedDataDirectory.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedDataDirectory.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.clone;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,8 +27,9 @@ import javax.xml.bind.annotation.XmlAttribute;
* Expected data directory.
*/
@Getter
+@Setter
public final class ExpectedDataDirectory extends AbstractExpectedSQLSegment {
- @XmlAttribute(name = "location")
+ @XmlAttribute
private String location;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedInstance.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedInstance.java
index f4b857a63b4..2a7cdd12995 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedInstance.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/clone/ExpectedInstance.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.clone;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,18 +27,19 @@ import javax.xml.bind.annotation.XmlAttribute;
* Expected instance.
*/
@Getter
+@Setter
public final class ExpectedInstance extends AbstractExpectedSQLSegment {
- @XmlAttribute(name = "username")
+ @XmlAttribute
private String username;
- @XmlAttribute(name = "hostname")
+ @XmlAttribute
private String hostname;
- @XmlAttribute(name = "port")
+ @XmlAttribute
private Integer port;
- @XmlAttribute(name = "password")
+ @XmlAttribute
private String password;
@XmlAttribute(name = "require-ssl")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/component/ExpectedComponent.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/component/ExpectedComponent.java
index 537f212d026..8c85bb60a04 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/component/ExpectedComponent.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/component/ExpectedComponent.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.component;
-import lombok.Getter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
* Expected component.
*/
-@Getter
public final class ExpectedComponent extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedCursorName.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedCursorName.java
index afa7e4305ef..0cb0c37ec49 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedCursorName.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedCursorName.java
@@ -17,14 +17,10 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.cursor;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
* Expected cursor name.
*/
-@Getter
-@Setter
public final class ExpectedCursorName extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedDirectionSegment.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedDirectionSegment.java
index d556e548381..211f5e6c337 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedDirectionSegment.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/cursor/ExpectedDirectionSegment.java
@@ -33,6 +33,6 @@ public final class ExpectedDirectionSegment extends AbstractExpectedSQLSegment {
@XmlAttribute(name = "direction-type")
private String directionType;
- @XmlAttribute(name = "count")
+ @XmlAttribute
private Long count;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/schema/ExpectedDatabase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/database/ExpectedDatabase.java
similarity index 90%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/schema/ExpectedDatabase.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/database/ExpectedDatabase.java
index d3d4a67ea79..11177124dab 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/schema/ExpectedDatabase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/database/ExpectedDatabase.java
@@ -15,16 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema;
+package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
- * Expected schema.
+ * Expected database.
*/
-@Getter
-@Setter
public final class ExpectedDatabase extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/definition/ExpectedChangeColumnDefinition.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/definition/ExpectedChangeColumnDefinition.java
index 896e845b9a9..67157d1533c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/definition/ExpectedChangeColumnDefinition.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/definition/ExpectedChangeColumnDefinition.java
@@ -37,6 +37,6 @@ public final class ExpectedChangeColumnDefinition extends AbstractExpectedSQLSeg
@XmlElement(name = "column-position")
private ExpectedColumnPosition columnPosition;
- @XmlElement(name = "previousColumn")
+ @XmlElement(name = "previous-column")
private ExpectedColumn previousColumn;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedDataSource.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedDataSource.java
index 295c5a02cff..8b6b4718fcb 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedDataSource.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedDataSource.java
@@ -34,7 +34,7 @@ public final class ExpectedDataSource extends AbstractExpectedIdentifierSQLSegme
@XmlAttribute
private String url;
- @XmlAttribute(name = "hostname")
+ @XmlAttribute
private String hostname;
@XmlAttribute
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedSQLParserRule.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedSQLParserRule.java
index 361b2dd658c..808c5538818 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedSQLParserRule.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/ExpectedSQLParserRule.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedSQLParserRule extends AbstractExpectedIdentifierSQLSegment {
- @XmlAttribute
+ @XmlAttribute(name = "sql-comment-parse-enabled")
private boolean sqlCommentParseEnabled;
@XmlElement(name = "parse-tree-cache")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptColumn.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptColumn.java
index 0d70ad1017c..46b2bf348c2 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptColumn.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptColumn.java
@@ -41,7 +41,7 @@ public final class ExpectedEncryptColumn extends AbstractExpectedIdentifierSQLSe
@XmlAttribute(name = "assisted-query-column")
private String assistedQueryColumn;
- @XmlElement(name = "encryptor")
+ @XmlElement
private ExpectedAlgorithm encryptor;
@XmlElement(name = "assisted-query-encryptor")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptRule.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptRule.java
index 3e0c372b1c5..f1a6fc28cc8 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptRule.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedEncryptRule.java
@@ -35,6 +35,6 @@ public final class ExpectedEncryptRule extends AbstractExpectedIdentifierSQLSegm
@XmlElement(name = "column")
private List<ExpectedEncryptColumn> columns;
- @XmlAttribute
+ @XmlAttribute(name = "query-with-cipher-column")
private Boolean queryWithCipherColumn;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShadowRule.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShadowRule.java
index 3ae887f4fcd..8dfef397c28 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShadowRule.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShadowRule.java
@@ -35,10 +35,10 @@ public final class ExpectedShadowRule extends AbstractExpectedIdentifierSQLSegme
@XmlAttribute(name = "rule-name")
private String ruleName;
- @XmlAttribute(name = "source")
+ @XmlAttribute
private String source;
- @XmlAttribute(name = "shadow")
+ @XmlAttribute
private String shadow;
@XmlElement(name = "table-rule")
@@ -47,8 +47,8 @@ public final class ExpectedShadowRule extends AbstractExpectedIdentifierSQLSegme
/**
* Expected shadow table rule.
*/
- @Setter
@Getter
+ @Setter
public static class ExpectedShadowTableRule extends AbstractExpectedIdentifierSQLSegment {
@XmlAttribute(name = "table-name")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShardingStrategy.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShardingStrategy.java
index 5dd6048ce64..3c2ce481582 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShardingStrategy.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/distsql/rdl/ExpectedShardingStrategy.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedShardingStrategy extends AbstractExpectedIdentifierSQLSegment {
- @XmlAttribute(name = "type")
+ @XmlAttribute
private String type;
@XmlAttribute(name = "sharding-column")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBetweenExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBetweenExpression.java
index fe3daffbeba..9c7dbfbb1d6 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBetweenExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBetweenExpression.java
@@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedBetweenExpression extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "not")
+ @XmlElement
private boolean not;
- @XmlElement(name = "left")
+ @XmlElement
private ExpectedExpression left;
@XmlElement(name = "between-expr")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBinaryOperationExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBinaryOperationExpression.java
index 650c4b150db..5dee69a77bc 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBinaryOperationExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedBinaryOperationExpression.java
@@ -30,12 +30,12 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedBinaryOperationExpression extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "left")
+ @XmlElement
private ExpectedExpression left;
- @XmlElement(name = "operator")
+ @XmlElement
private String operator;
- @XmlElement(name = "right")
+ @XmlElement
private ExpectedExpression right;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExistsSubquery.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExistsSubquery.java
index d4c052eb935..3a4361af43c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExistsSubquery.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExistsSubquery.java
@@ -31,9 +31,9 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedExistsSubquery extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "not")
+ @XmlElement
private boolean not;
- @XmlElement(name = "subquery")
+ @XmlElement
private ExpectedSubquery subquery;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExpression.java
index c0de13ba80b..2f5203e8c92 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedExpression.java
@@ -45,7 +45,7 @@ public final class ExpectedExpression extends AbstractExpectedSQLSegment {
@XmlElement(name = "binary-operation-expression")
private ExpectedBinaryOperationExpression binaryOperationExpression;
- @XmlElement(name = "column")
+ @XmlElement
private ExpectedColumn column;
@XmlElement(name = "data-type")
@@ -60,7 +60,7 @@ public final class ExpectedExpression extends AbstractExpectedSQLSegment {
@XmlElement(name = "expression-projection")
private ExpectedExpressionProjection expressionProjection;
- @XmlElement(name = "function")
+ @XmlElement
private ExpectedFunction function;
@XmlElement(name = "in-expression")
@@ -78,7 +78,7 @@ public final class ExpectedExpression extends AbstractExpectedSQLSegment {
@XmlElement(name = "parameter-marker-expression")
private ExpectedParameterMarkerExpression parameterMarkerExpression;
- @XmlElement(name = "subquery")
+ @XmlElement
private ExpectedSubquery subquery;
@XmlElement(name = "aggregation-projection")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedInExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedInExpression.java
index 9cea172a66c..b724daa91be 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedInExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedInExpression.java
@@ -30,12 +30,12 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedInExpression extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "not")
+ @XmlElement
private boolean not;
- @XmlElement(name = "left")
+ @XmlElement
private ExpectedExpression left;
- @XmlElement(name = "right")
+ @XmlElement
private ExpectedExpression right;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedListExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedListExpression.java
index dfbb3622f13..93e3b9029fc 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedListExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedListExpression.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.expr;
import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlElement;
@@ -29,9 +28,8 @@ import java.util.List;
* Expected list expression.
*/
@Getter
-@Setter
public final class ExpectedListExpression extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "items")
- private List<ExpectedExpression> items = new LinkedList<>();
+ @XmlElement
+ private final List<ExpectedExpression> items = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedNotExpression.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedNotExpression.java
index 67be083c40d..ab16c63afd7 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedNotExpression.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/expr/ExpectedNotExpression.java
@@ -30,6 +30,6 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public class ExpectedNotExpression extends AbstractExpectedSQLSegment implements ExpectedExpressionSegment {
- @XmlElement(name = "expr")
+ @XmlElement
private ExpectedExpression expr;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/from/ExpectedFromSchema.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/from/ExpectedFromSchema.java
index d40792cf477..12434b1c106 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/from/ExpectedFromSchema.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/from/ExpectedFromSchema.java
@@ -18,13 +18,15 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.from;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
/**
* Expected from schema segment.
*/
@Getter
+@Setter
public final class ExpectedFromSchema extends AbstractExpectedSQLSegment {
private ExpectedDatabase schema;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/function/ExpectedFunction.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/function/ExpectedFunction.java
index f09e4831848..3f1ccd604ed 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/function/ExpectedFunction.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/function/ExpectedFunction.java
@@ -42,7 +42,7 @@ public final class ExpectedFunction extends AbstractExpectedSQLSegment implement
@XmlElement(name = "parameter")
private List<ExpectedExpression> parameters = new LinkedList<>();
- @XmlAttribute(name = "text")
+ @XmlAttribute
private String text;
@XmlAttribute(name = "literal-text")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/group/ExpectedGroup.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/group/ExpectedGroup.java
index 554ef8496b8..72e6acd2407 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/group/ExpectedGroup.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/group/ExpectedGroup.java
@@ -17,14 +17,10 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.group;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
* Expected group.
*/
-@Getter
-@Setter
public final class ExpectedGroup extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/having/ExpectedHavingClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/having/ExpectedHavingClause.java
index 4dae4ad9c56..eb4c11e7729 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/having/ExpectedHavingClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/having/ExpectedHavingClause.java
@@ -34,6 +34,6 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedHavingClause extends AbstractExpectedSQLSegment {
- @XmlElement(name = "expr")
+ @XmlElement
private ExpectedExpression expr;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedCacheTableIndex.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedCacheTableIndex.java
index 3c3861562d0..e22713c414a 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedCacheTableIndex.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedCacheTableIndex.java
@@ -33,7 +33,7 @@ import java.util.List;
@Setter
public final class ExpectedCacheTableIndex extends AbstractExpectedIdentifierSQLSegment {
- @XmlElement(name = "table")
+ @XmlElement
private ExpectedSimpleTable table;
@XmlElement(name = "index")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedLoadTableIndex.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedLoadTableIndex.java
index 2e249e15d10..8f01acf40d4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedLoadTableIndex.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedLoadTableIndex.java
@@ -33,7 +33,7 @@ import java.util.List;
@Setter
public final class ExpectedLoadTableIndex extends AbstractExpectedIdentifierSQLSegment {
- @XmlElement(name = "table")
+ @XmlElement
private ExpectedSimpleTable table;
@XmlElement(name = "index")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedPartitionDefinition.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedPartitionDefinition.java
index db7906a5fde..bef98fe9627 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedPartitionDefinition.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/index/ExpectedPartitionDefinition.java
@@ -33,7 +33,7 @@ import java.util.List;
@Setter
public final class ExpectedPartitionDefinition extends AbstractExpectedIdentifierSQLSegment {
- @XmlElement(name = "table")
+ @XmlElement
private ExpectedSimpleTable table;
@XmlElement(name = "partition")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertColumnsClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertColumnsClause.java
index 7bebe708a3f..9e40ebff49d 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertColumnsClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertColumnsClause.java
@@ -32,5 +32,5 @@ import java.util.List;
public final class ExpectedInsertColumnsClause extends AbstractExpectedSQLSegment {
@XmlElement(name = "column")
- private List<ExpectedColumn> columns = new LinkedList<>();
+ private final List<ExpectedColumn> columns = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertMultiTableElement.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertMultiTableElement.java
index 34170492b50..254c2c5eb53 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertMultiTableElement.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertMultiTableElement.java
@@ -32,5 +32,5 @@ import java.util.List;
public final class ExpectedInsertMultiTableElement extends AbstractExpectedSQLSegment {
@XmlElement(name = "table-element")
- private List<InsertStatementTestCase> insertTestCases = new LinkedList<>();
+ private final List<InsertStatementTestCase> insertTestCases = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertValuesClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertValuesClause.java
index 9cb0e1e337f..0dfe8a48107 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertValuesClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedInsertValuesClause.java
@@ -31,5 +31,5 @@ import java.util.List;
public final class ExpectedInsertValuesClause extends AbstractExpectedSQLSegment {
@XmlElement(name = "value")
- private List<ExpectedInsertValue> values = new LinkedList<>();
+ private final List<ExpectedInsertValue> values = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedOnDuplicateKeyColumns.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedOnDuplicateKeyColumns.java
index 9384472a04a..a661b46a46e 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedOnDuplicateKeyColumns.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/insert/ExpectedOnDuplicateKeyColumns.java
@@ -32,5 +32,5 @@ import java.util.List;
public final class ExpectedOnDuplicateKeyColumns extends AbstractExpectedSQLSegment {
@XmlElement(name = "assignment")
- private List<ExpectedAssignment> assignments = new LinkedList<>();
+ private final List<ExpectedAssignment> assignments = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/like/ExpectedLikeClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/like/ExpectedLikeClause.java
index 0c07fa43e3c..5812feadb42 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/like/ExpectedLikeClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/like/ExpectedLikeClause.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlAttribute;
/**
* Expected like clause.
*/
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class ExpectedLikeClause extends AbstractExpectedSQLSegment {
@XmlAttribute
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/limit/ExpectedPaginationValue.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/limit/ExpectedPaginationValue.java
index 42e5990e063..a71ce697a5c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/limit/ExpectedPaginationValue.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/limit/ExpectedPaginationValue.java
@@ -25,9 +25,12 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+/**
+ * Expected pagination value.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class ExpectedPaginationValue extends AbstractExpectedSQLSegment {
@XmlAttribute
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/lock/ExpectedLockClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/lock/ExpectedLockClause.java
index 59f7f52be28..41ed0664c87 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/lock/ExpectedLockClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/lock/ExpectedLockClause.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.lock;
import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.column.ExpectedColumn;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.table.ExpectedSimpleTable;
@@ -31,7 +30,6 @@ import java.util.List;
* Expected lock clause.
*/
@Getter
-@Setter
public final class ExpectedLockClause extends AbstractExpectedSQLSegment {
@XmlElement(name = "table")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/login/ExpectedLogin.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/login/ExpectedLogin.java
index 6465f39fceb..4993469af6f 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/login/ExpectedLogin.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/login/ExpectedLogin.java
@@ -17,14 +17,10 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.login;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
* Expected login.
*/
-@Getter
-@Setter
public final class ExpectedLogin extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/orderby/item/impl/ExpectedExpressionOrderByItem.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/orderby/item/impl/ExpectedExpressionOrderByItem.java
index 7e66d7336c4..546ad92f503 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/orderby/item/impl/ExpectedExpressionOrderByItem.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/orderby/item/impl/ExpectedExpressionOrderByItem.java
@@ -35,6 +35,6 @@ public final class ExpectedExpressionOrderByItem extends ExpectedOrderByItem {
@XmlAttribute
private String expression;
- @XmlElement(name = "expr")
+ @XmlElement
private ExpectedExpression expr;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/plugin/ExpectedPlugin.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/plugin/ExpectedPlugin.java
index 27e5ab1b7be..1a056459f9a 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/plugin/ExpectedPlugin.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/plugin/ExpectedPlugin.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.plugin;
-import lombok.Getter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedIdentifierSQLSegment;
/**
* Expected plugin.
*/
-@Getter
public final class ExpectedPlugin extends AbstractExpectedIdentifierSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjection.java
index 41b1f5f4da5..40ded5ee9c4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjection.java
@@ -19,5 +19,8 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.ExpectedSQLSegment;
+/**
+ * Expected projection.
+ */
public interface ExpectedProjection extends ExpectedSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjections.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjections.java
index 08b7781ee47..7495bfbe012 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjections.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/ExpectedProjections.java
@@ -36,10 +36,10 @@ import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+@Getter
@Setter
public final class ExpectedProjections extends AbstractExpectedSQLSegment {
- @Getter
@XmlAttribute(name = "distinct-row")
private boolean distinctRow;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationDistinctProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationDistinctProjection.java
index 29fb0a245b9..d8453371307 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationDistinctProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationDistinctProjection.java
@@ -22,6 +22,9 @@ import lombok.Setter;
import javax.xml.bind.annotation.XmlAttribute;
+/**
+ * Expected aggregation distinct projection.
+ */
@Getter
@Setter
public final class ExpectedAggregationDistinctProjection extends ExpectedAggregationProjection {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationProjection.java
index 0297cb39b11..dd0cf6d2e89 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/aggregation/ExpectedAggregationProjection.java
@@ -28,6 +28,9 @@ import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
+/**
+ * Expected aggregation projection.
+ */
@Getter
@Setter
public class ExpectedAggregationProjection extends AbstractExpectedSQLSegment implements ExpectedProjection {
@@ -42,5 +45,5 @@ public class ExpectedAggregationProjection extends AbstractExpectedSQLSegment im
private String alias;
@XmlElement(name = "parameters")
- private List<ExpectedExpression> parameters = new LinkedList<>();
+ private final List<ExpectedExpression> parameters = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/column/ExpectedColumnProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/column/ExpectedColumnProjection.java
index 5e20c64a7b4..d6ed61acc18 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/column/ExpectedColumnProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/column/ExpectedColumnProjection.java
@@ -26,6 +26,9 @@ import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.se
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+/**
+ * Expected column projection.
+ */
@Getter
@Setter
public final class ExpectedColumnProjection extends AbstractExpectedIdentifierSQLSegment implements ExpectedProjection {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/expression/ExpectedExpressionProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/expression/ExpectedExpressionProjection.java
index b75dcf04185..80b4b9d9a77 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/expression/ExpectedExpressionProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/expression/ExpectedExpressionProjection.java
@@ -27,19 +27,22 @@ import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.se
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+/**
+ * Expected expression projection.
+ */
@Getter
@Setter
public final class ExpectedExpressionProjection extends AbstractExpectedSQLSegment implements ExpectedProjection, ExpectedComplexExpressionSegment {
- @XmlAttribute(name = "text")
+ @XmlAttribute
private String text;
@XmlAttribute(name = "literal-text")
private String literalText;
- @XmlAttribute(name = "alias")
+ @XmlAttribute
private String alias;
- @XmlElement(name = "expr")
+ @XmlElement
private ExpectedExpression expr;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/shorthand/ExpectedShorthandProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/shorthand/ExpectedShorthandProjection.java
index 58caff1efc5..32e4e5df557 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/shorthand/ExpectedShorthandProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/shorthand/ExpectedShorthandProjection.java
@@ -25,6 +25,9 @@ import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.se
import javax.xml.bind.annotation.XmlElement;
+/**
+ * Expected shorthand projection.
+ */
@Getter
@Setter
public final class ExpectedShorthandProjection extends AbstractExpectedSQLSegment implements ExpectedProjection {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/top/ExpectedTopProjection.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/top/ExpectedTopProjection.java
index c157185d255..c0a885bc8ad 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/top/ExpectedTopProjection.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/projection/impl/top/ExpectedTopProjection.java
@@ -25,11 +25,14 @@ import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.se
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+/**
+ * Expected top projection.
+ */
@Getter
@Setter
public final class ExpectedTopProjection extends AbstractExpectedSQLSegment implements ExpectedProjection {
- @XmlAttribute(name = "alias")
+ @XmlAttribute
private String alias;
@XmlElement(name = "top-value")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/reset/ExpectedResetOptionSegment.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/reset/ExpectedResetOptionSegment.java
index 045b26d7f86..6645eaeffd4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/reset/ExpectedResetOptionSegment.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/reset/ExpectedResetOptionSegment.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.reset;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,17 +27,18 @@ import javax.xml.bind.annotation.XmlAttribute;
* Expected reset option segment.
*/
@Getter
+@Setter
public final class ExpectedResetOptionSegment extends AbstractExpectedSQLSegment {
- @XmlAttribute(name = "master")
+ @XmlAttribute
private boolean master;
@XmlAttribute(name = "binary-log-file-index-number")
private Long binaryLogFileIndexNumber;
- @XmlAttribute(name = "all")
+ @XmlAttribute
private boolean all;
- @XmlAttribute(name = "channel")
+ @XmlAttribute
private String channel;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/show/ExpectedShowFilter.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/show/ExpectedShowFilter.java
index d0d76b458af..eade59b4626 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/show/ExpectedShowFilter.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/show/ExpectedShowFilter.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.show;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.like.ExpectedLikeClause;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.where.ExpectedWhereClause;
@@ -28,11 +29,12 @@ import javax.xml.bind.annotation.XmlElement;
* Expected show filter segment.
*/
@Getter
+@Setter
public final class ExpectedShowFilter extends AbstractExpectedSQLSegment {
- @XmlElement(name = "like")
+ @XmlElement
private ExpectedLikeClause like;
- @XmlElement(name = "where")
+ @XmlElement
private ExpectedWhereClause where;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/table/ExpectedJoinTable.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/table/ExpectedJoinTable.java
index bfb7d7b2b7a..478a7ce269d 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/table/ExpectedJoinTable.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/table/ExpectedJoinTable.java
@@ -35,10 +35,10 @@ import java.util.List;
@Setter
public final class ExpectedJoinTable extends AbstractExpectedDelimiterSQLSegment {
- @XmlElement(name = "left")
+ @XmlElement
private ExpectedTable left;
- @XmlElement(name = "right")
+ @XmlElement
private ExpectedTable right;
@XmlElement(name = "on-condition")
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/user/ExpectedUser.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/user/ExpectedUser.java
index f55bf49b3a4..a8f9c328b29 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/user/ExpectedUser.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/user/ExpectedUser.java
@@ -30,6 +30,6 @@ import javax.xml.bind.annotation.XmlAttribute;
@Setter
public final class ExpectedUser extends AbstractExpectedSQLSegment {
- @XmlAttribute(name = "name")
+ @XmlAttribute
private String name;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/where/ExpectedWhereClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/where/ExpectedWhereClause.java
index 8310cf626bb..8230f943105 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/where/ExpectedWhereClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/where/ExpectedWhereClause.java
@@ -34,6 +34,6 @@ import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD)
public final class ExpectedWhereClause extends AbstractExpectedSQLSegment {
- @XmlElement(name = "expr")
+ @XmlElement
private ExpectedExpression expr;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/window/ExpectedWindowClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/window/ExpectedWindowClause.java
index b12a4424c48..c252959c936 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/window/ExpectedWindowClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/window/ExpectedWindowClause.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.window;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
import javax.xml.bind.annotation.XmlAccessType;
@@ -27,8 +25,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
/**
* Expected window clause.
*/
-@Getter
-@Setter
@XmlAccessorType(XmlAccessType.FIELD)
public final class ExpectedWindowClause extends AbstractExpectedSQLSegment {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/DatabaseContainedTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/DatabaseContainedTestCase.java
index fa4875a17b2..9c0b71ec4c3 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/DatabaseContainedTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/DatabaseContainedTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
import javax.xml.bind.annotation.XmlElement;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/SQLParserTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/SQLParserTestCase.java
index 492e0440197..2ae11cf615a 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/SQLParserTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/SQLParserTestCase.java
@@ -45,7 +45,7 @@ public abstract class SQLParserTestCase {
private String parameters;
@XmlElement(name = "comment")
- private List<ExpectedComment> comments = new LinkedList<>();
+ private final List<ExpectedComment> comments = new LinkedList<>();
/**
* Get parameters.
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowColumnsStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowColumnsStatementTestCase.java
index 16123d5219f..2cdce0ca319 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowColumnsStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowColumnsStatementTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.show.ExpectedShowFilter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowIndexStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowIndexStatementTestCase.java
index 1bc2515262e..387583386d1 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowIndexStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/ShowIndexStatementTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/UseStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/UseStatementTestCase.java
index 6368b2f0a94..4338294d879 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/UseStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dal/UseStatementTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.schema.ExpectedDatabase;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.database.ExpectedDatabase;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
import javax.xml.bind.annotation.XmlElement;
diff --git a/test/parser/src/main/resources/case/ddl/alter-table.xml b/test/parser/src/main/resources/case/ddl/alter-table.xml
index f582d83e3b2..2f0e9e20531 100644
--- a/test/parser/src/main/resources/case/ddl/alter-table.xml
+++ b/test/parser/src/main/resources/case/ddl/alter-table.xml
@@ -83,7 +83,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_integer_type_mysql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -102,7 +102,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_integer_type_oracle">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -121,7 +121,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_integer_type">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -140,7 +140,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_fixed_point_type">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -154,7 +154,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_float_point_type_mysql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -168,7 +168,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_float_point_type_oracle">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -182,7 +182,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_float_point_type_postgresql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -221,7 +221,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_bit_type">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -230,7 +230,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_date_type_mysql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -258,6 +258,7 @@
</column-definition>
</add-column>
</alter-table>
+
<alter-table sql-case-id="alter_table_add_columns_string_type_mysql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -316,7 +317,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_string_type_postgresql">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -330,7 +331,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_date_type">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -354,7 +355,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_columns_date_type_oracle">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -378,7 +379,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_column_with_first">
<table name="t_order" start-index="12" stop-index="18" />
<add-column>
@@ -521,7 +522,7 @@
<column-definition type="VARCHAR" start-index="35" stop-index="53">
<column name="column4" start-index="35" stop-index="41" />
</column-definition>
- <previousColumn name="user_id" start-index="27" stop-index="33" />
+ <previous-column name="user_id" start-index="27" stop-index="33" />
</change-column>
</alter-table>
@@ -576,7 +577,7 @@
<alter-table sql-case-id="alter_table_drop_primary_key">
<table name="t_order" start-index="12" stop-index="18" />
</alter-table>
-
+
<alter-table sql-case-id="alter_table_not_null">
<table name="t1" start-index="12" stop-index="13" />
<add-column>
@@ -585,7 +586,7 @@
</column-definition>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_not_null_first">
<table name="t1" start-index="12" stop-index="13" />
<add-column>
@@ -595,7 +596,7 @@
<column-position start-index="37" stop-index="41"/>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_not_null_after">
<table name="t1" start-index="12" stop-index="13" />
<add-column>
@@ -607,17 +608,17 @@
</column-position>
</add-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_change_unsigned_not_null">
<table name="t1" start-index="12" stop-index="13" />
<change-column>
<column-definition type="real" start-index="25" stop-index="49">
<column name="c2" />
</column-definition>
- <previousColumn name="c1" start-index="22" stop-index="23" />
+ <previous-column name="c1" start-index="22" stop-index="23" />
</change-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_modify_unsigned_not_null">
<table name="t1" start-index="12" stop-index="13" />
<modify-column>
@@ -626,7 +627,7 @@
</column-definition>
</modify-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_modify_unsigned_zerofill_not_null">
<table name="t1" start-index="12" stop-index="13" />
<modify-column>
@@ -635,21 +636,21 @@
</column-definition>
</modify-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_change_unsigned_zerofill_not_null">
<table name="t1" start-index="12" stop-index="13" />
<change-column>
<column-definition type="real" start-index="25" stop-index="58">
<column name="c2" />
</column-definition>
- <previousColumn name="c1" start-index="22" stop-index="23" />
+ <previous-column name="c1" start-index="22" stop-index="23" />
</change-column>
</alter-table>
-
+
<alter-table sql-case-id="alter_table_add_partition">
<table name="t1" start-index="12" stop-index="13" />
</alter-table>
-
+
<alter-table sql-case-id="alter_table_partition">
<table name="t1" start-index="12" stop-index="13" />
</alter-table>
diff --git a/test/parser/src/main/resources/case/ral/updatable.xml b/test/parser/src/main/resources/case/ral/updatable.xml
index f6172d2027b..e6fd8667663 100644
--- a/test/parser/src/main/resources/case/ral/updatable.xml
+++ b/test/parser/src/main/resources/case/ral/updatable.xml
@@ -26,7 +26,7 @@
<refresh-table-metadata sql-case-id="refresh-table-metadata-table-with-schema" table-name="t_order" storage-unit-name="ds_0" schema-name="public" />
<alter-sql-parser-rule sql-case-id="alter-sql-parser-rule">
- <sql-parser sqlCommentParseEnabled="false">
+ <sql-parser sql-comment-parse-enabled="false">
<parse-tree-cache initial-capacity="10" maximum-size="11" />
<sql-statement-cache initial-capacity="11" maximum-size="11" />
</sql-parser>
diff --git a/test/parser/src/main/resources/case/rdl/alter.xml b/test/parser/src/main/resources/case/rdl/alter.xml
index 17927c4a973..64f16f4b37c 100644
--- a/test/parser/src/main/resources/case/rdl/alter.xml
+++ b/test/parser/src/main/resources/case/rdl/alter.xml
@@ -222,7 +222,7 @@
</alter-encrypt-rule>
<alter-encrypt-rule sql-case-id="alter-encrypt-rule-with-query-with-cipher-column">
- <rule name="t_encrypt" queryWithCipherColumn="false">
+ <rule name="t_encrypt" query-with-cipher-column="false">
<column name="user_id" plain-column="user_plain" cipher-column="user_cipher">
<encryptor algorithm-name="AES">
<properties>
diff --git a/test/parser/src/main/resources/case/rdl/create.xml b/test/parser/src/main/resources/case/rdl/create.xml
index f68b99d496c..ee1c3bff771 100644
--- a/test/parser/src/main/resources/case/rdl/create.xml
+++ b/test/parser/src/main/resources/case/rdl/create.xml
@@ -404,11 +404,11 @@
</create-encrypt-rule>
<create-encrypt-rule sql-case-id="create-encrypt-rule-with-query-with-cipher-column">
- <rule name="encrypt" queryWithCipherColumn="false">
+ <rule name="encrypt" query-with-cipher-column="false">
<column name="user_id" plain-column="user_plain" cipher-column="user_cipher">
<encryptor algorithm-name="AES">
<properties>
- <property key="aes-key-value" value="123456abc"/>
+ <property key="aes-key-value" value="123456abc" />
</properties>
</encryptor>
</column>