Merge SQLRULStatement and RULStatement

apache · Jan 24, 2024 · f924416 · f924416
1 parent f3a6254
commit f924416
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 110 deletions.
diff --git a/...tement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java b/...tement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java
diff --git a/...nt/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java b/...nt/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java
@@ -18,15 +18,15 @@
 package org.apache.shardingsphere.distsql.statement.rul.sql;
 
 import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
 
 /**
  * Format statement.
  */
+@RequiredArgsConstructor
 @Getter
-public final class FormatStatement extends SQLRULStatement {
+public final class FormatStatement extends RULStatement {
 
-    public FormatStatement(final String sql) {
-        super(sql);
-    }
+    private final String sql;
 }
diff --git a/...ent/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java b/...ent/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java
@@ -18,15 +18,15 @@
 package org.apache.shardingsphere.distsql.statement.rul.sql;
 
 import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
 
 /**
  * Parse statement.
  */
+@RequiredArgsConstructor
 @Getter
-public final class ParseStatement extends SQLRULStatement {
+public final class ParseStatement extends RULStatement {
 
-    public ParseStatement(final String sql) {
-        super(sql);
-    }
+    private final String sql;
 }
diff --git a/...t/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java b/...t/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java
@@ -18,15 +18,15 @@
 package org.apache.shardingsphere.distsql.statement.rul.sql;
 
 import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
 
 /**
  * Preview statement.
  */
+@RequiredArgsConstructor
 @Getter
-public final class PreviewStatement extends SQLRULStatement {
+public final class PreviewStatement extends RULStatement {
 
-    public PreviewStatement(final String sql) {
-        super(sql);
-    }
+    private final String sql;
 }
diff --git a/.../shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java b/.../shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java
@@ -20,10 +20,17 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement;
 import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.SQLRULStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.FormatSQLStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.ParseStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.PreviewStatementAssert;
 import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.FormatSQLStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.ParseStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.PreviewStatementTestCase;
 
 /**
  * RUL statement assert.
@@ -39,8 +46,12 @@ public final class RULStatementAssert {
      * @param expected expected RUL statement test case
      */
     public static void assertIs(final SQLCaseAssertContext assertContext, final RULStatement actual, final SQLParserTestCase expected) {
-        if (actual instanceof SQLRULStatement) {
-            SQLRULStatementAssert.assertIs(assertContext, (SQLRULStatement) actual, expected);
+        if (actual instanceof PreviewStatement) {
+            PreviewStatementAssert.assertIs(assertContext, (PreviewStatement) actual, (PreviewStatementTestCase) expected);
+        } else if (actual instanceof ParseStatement) {
+            ParseStatementAssert.assertIs(assertContext, (ParseStatement) actual, (ParseStatementTestCase) expected);
+        } else if (actual instanceof FormatStatement) {
+            FormatSQLStatementAssert.assertIs(assertContext, (FormatStatement) actual, (FormatSQLStatementTestCase) expected);
         }
     }
 }
diff --git a/...gsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java b/...gsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java
diff --git a/...ul/impl/sql/FormatSQLStatementAssert.java → ...nt/rul/type/FormatSQLStatementAssert.java b/...ul/impl/sql/FormatSQLStatementAssert.java → ...nt/rul/type/FormatSQLStatementAssert.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

diff --git a/...nt/rul/impl/sql/ParseStatementAssert.java → ...tement/rul/type/ParseStatementAssert.java b/...nt/rul/impl/sql/ParseStatementAssert.java → ...tement/rul/type/ParseStatementAssert.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

diff --git a/.../rul/impl/sql/PreviewStatementAssert.java → ...ment/rul/type/PreviewStatementAssert.java b/.../rul/impl/sql/PreviewStatementAssert.java → ...ment/rul/type/PreviewStatementAssert.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;