for #660: refactor begin-position-with-placeholder &...

for #660: refactor begin-position-with-placeholder & begin-position-without-placeholder =>  placeholder-begin-position & literal-begin-position

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/engine/IntegrateSupportedSQLParsingTest.java

@@ -262,9 +262,9 @@ public final class IntegrateSupportedSQLParsingTest extends AbstractBaseIntegrat
     
     private void assertGeneratedKeyToken(final GeneratedKeyToken actual, final GeneratedKeyTokenAssert expected) {
         if (SQLCaseType.Placeholder == sqlCaseType) {
-            assertThat(getFullAssertMessage("Generated key token begin position assertion error: "), actual.getBeginPosition(), is(expected.getBeginPositionWithPlaceholder()));
+            assertThat(getFullAssertMessage("Generated key token begin position assertion error: "), actual.getBeginPosition(), is(expected.getPlaceholderBeginPosition()));
         } else {
-            assertThat(getFullAssertMessage("Generated key token begin position assertion error: "), actual.getBeginPosition(), is(expected.getBeginPositionWithoutPlaceholder()));
+            assertThat(getFullAssertMessage("Generated key token begin position assertion error: "), actual.getBeginPosition(), is(expected.getLiteralBeginPosition()));
         }
     }
     
@@ -311,9 +311,9 @@ public final class IntegrateSupportedSQLParsingTest extends AbstractBaseIntegrat
     
     private void assertOrderByToken(final OrderByToken actual, final OrderByTokenAssert expected) {
         if (SQLCaseType.Placeholder == sqlCaseType) {
-            assertThat(getFullAssertMessage("Order by token begin position assertion error: "), actual.getBeginPosition(), is(expected.getBeginPositionWithPlaceholder()));
+            assertThat(getFullAssertMessage("Order by token begin position assertion error: "), actual.getBeginPosition(), is(expected.getPlaceholderBeginPosition()));
         } else {
-            assertThat(getFullAssertMessage("Order by token begin position assertion error: "), actual.getBeginPosition(), is(expected.getBeginPositionWithoutPlaceholder()));
+            assertThat(getFullAssertMessage("Order by token begin position assertion error: "), actual.getBeginPosition(), is(expected.getLiteralBeginPosition()));
         }
     }
     

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/GeneratedKeyTokenAssert.java

@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlAttribute;
 @XmlAccessorType(XmlAccessType.FIELD)
 public final class GeneratedKeyTokenAssert implements SQLTokenAssert {
     
-    @XmlAttribute(name = "begin-position-with-placeholder")
-    private int beginPositionWithPlaceholder;
+    @XmlAttribute(name = "placeholder-begin-position")
+    private int placeholderBeginPosition;
     
-    @XmlAttribute(name = "begin-position-without-placeholder")
-    private int beginPositionWithoutPlaceholder;
+    @XmlAttribute(name = "literal-begin-position")
+    private int literalBeginPosition;
 }

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/token/OrderByTokenAssert.java

@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlAttribute;
 @XmlAccessorType(XmlAccessType.FIELD)
 public final class OrderByTokenAssert implements SQLTokenAssert {
     
-    @XmlAttribute(name = "begin-position-with-placeholder")
-    private int beginPositionWithPlaceholder;
+    @XmlAttribute(name = "placeholder-begin-position")
+    private int placeholderBeginPosition;
     
-    @XmlAttribute(name = "begin-position-without-placeholder")
-    private int beginPositionWithoutPlaceholder;
+    @XmlAttribute(name = "literal-begin-position")
+    private int literalBeginPosition;
 }

sharding-core/src/test/resources/parser/insert.xml

@@ -65,7 +65,7 @@
                     <item>item_id</item>
                 </items>
             </items-token>
-            <generated-key-token begin-position-with-placeholder="73" begin-position-without-placeholder="77" />
+            <generated-key-token placeholder-begin-position="73" literal-begin-position="77" />
         </tokens>
         <conditions>
             <condition column-name="order_id" table-name="t_order_item" operator="EQUAL">

sharding-core/src/test/resources/parser/select_group_by.xml

@@ -6,7 +6,7 @@
         </tables>
         <tokens>
             <table-token begin-position="76" original-literals="`t_order_item`" />
-            <order-by-token begin-position-with-placeholder="156" begin-position-without-placeholder="162" />
+            <order-by-token placeholder-begin-position="156" literal-begin-position="162" />
         </tokens>
         <conditions>
             <condition column-name="order_id" table-name="t_order_item" operator="IN">
@@ -155,7 +155,7 @@
                     <item>o.user_id AS GROUP_BY_DERIVED_0 </item>
                 </items>
             </items-token>
-            <order-by-token begin-position-with-placeholder="194" begin-position-without-placeholder="195" />
+            <order-by-token placeholder-begin-position="194" literal-begin-position="195" />
         </tokens>
         <conditions>
             <condition column-name="user_id" table-name="t_order" operator="IN">
@@ -266,7 +266,7 @@
         </tables>
         <tokens>
             <table-token begin-position="58" original-literals="t_order" />
-            <order-by-token begin-position-with-placeholder="80" begin-position-without-placeholder="80" />
+            <order-by-token placeholder-begin-position="80" literal-begin-position="80" />
         </tokens>
         <aggregation-select-items>
             <aggregation-select-item type="SUM" inner-expression="(order_id)" alias="orders_sum" />