[shardingsphere] branch master updated: Refactor sql loader package (#22133)

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 fc550509c30 Refactor sql loader package (#22133)
fc550509c30 is described below

commit fc550509c3098f8e26df05a9d19238cb9bbe007e
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Nov 13 15:17:00 2022 +0800

    Refactor sql loader package (#22133)
---
 .../sql/parser/engine/dialect/MySQLParserParameterizedIT.java       | 2 +-
 .../sql/parser/engine/dialect/PostgreSQLParserParameterizedIT.java  | 2 +-
 .../test/integration/sql/parser/loader/SQLCaseLoader.java           | 2 ++
 .../sql/parser/loader/{ => strategy}/SQLCaseLoadStrategy.java       | 4 +++-
 .../loader/{ => strategy}/impl/GitHubSQLCaseLoadStrategy.java       | 6 +++---
 .../loader/{ => strategy}/impl/LocalFileSQLCaseLoadStrategy.java    | 6 +++---
 .../sql/parser/loader/{ => summary}/AssertableFileSummary.java      | 2 +-
 .../integration/sql/parser/loader/{ => summary}/FileSummary.java    | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/MySQLParserParameterizedIT.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/MySQLParserParameterizedIT.java
index 3cd8829a18b..078bcc0705a 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/MySQLParserParameterizedIT.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/MySQLParserParameterizedIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.sql.parser.engine.dialect;
 
 import org.apache.shardingsphere.test.integration.sql.parser.engine.SQLParserParameterizedIT;
 import org.apache.shardingsphere.test.integration.sql.parser.loader.SQLCaseLoader;
-import org.apache.shardingsphere.test.integration.sql.parser.loader.impl.GitHubSQLCaseLoadStrategy;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.impl.GitHubSQLCaseLoadStrategy;
 import org.apache.shardingsphere.test.integration.sql.parser.result.SQLParserResultProcessorManager;
 import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
 import org.junit.runner.RunWith;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/PostgreSQLParserParameterizedIT.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/PostgreSQLParserParameterizedIT.java
index 685798bebdf..b96b90e25f7 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/PostgreSQLParserParameterizedIT.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/engine/dialect/PostgreSQLParserParameterizedIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.sql.parser.engine.dialect;
 
 import org.apache.shardingsphere.test.integration.sql.parser.engine.SQLParserParameterizedIT;
 import org.apache.shardingsphere.test.integration.sql.parser.loader.SQLCaseLoader;
-import org.apache.shardingsphere.test.integration.sql.parser.loader.impl.GitHubSQLCaseLoadStrategy;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.impl.GitHubSQLCaseLoadStrategy;
 import org.apache.shardingsphere.test.integration.sql.parser.result.impl.SQLParserCSVResultProcessor;
 import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
 import org.junit.runner.RunWith;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
index 5826be91d21..e3af8b011eb 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
@@ -20,6 +20,8 @@ package org.apache.shardingsphere.test.integration.sql.parser.loader;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.test.integration.sql.parser.env.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.SQLCaseLoadStrategy;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.summary.FileSummary;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoadStrategy.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/SQLCaseLoadStrategy.java
similarity index 91%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoadStrategy.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/SQLCaseLoadStrategy.java
index fa0a9958584..68780430286 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoadStrategy.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/SQLCaseLoadStrategy.java
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.integration.sql.parser.loader;
+package org.apache.shardingsphere.test.integration.sql.parser.loader.strategy;
+
+import org.apache.shardingsphere.test.integration.sql.parser.loader.summary.FileSummary;
 
 import java.net.URI;
 import java.util.Collection;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/GitHubSQLCaseLoadStrategy.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/GitHubSQLCaseLoadStrategy.java
similarity index 97%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/GitHubSQLCaseLoadStrategy.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/GitHubSQLCaseLoadStrategy.java
index a943ab01abb..0483d3e689f 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/GitHubSQLCaseLoadStrategy.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/GitHubSQLCaseLoadStrategy.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.integration.sql.parser.loader.impl;
+package org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.impl;
 
 import com.jayway.jsonpath.JsonPath;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.integration.sql.parser.loader.FileSummary;
-import org.apache.shardingsphere.test.integration.sql.parser.loader.SQLCaseLoadStrategy;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.summary.FileSummary;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.SQLCaseLoadStrategy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/LocalFileSQLCaseLoadStrategy.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/LocalFileSQLCaseLoadStrategy.java
similarity index 94%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/LocalFileSQLCaseLoadStrategy.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/LocalFileSQLCaseLoadStrategy.java
index 657e28c9060..b280ab2ae1d 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/impl/LocalFileSQLCaseLoadStrategy.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/strategy/impl/LocalFileSQLCaseLoadStrategy.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.integration.sql.parser.loader.impl;
+package org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.impl;
 
-import org.apache.shardingsphere.test.integration.sql.parser.loader.FileSummary;
-import org.apache.shardingsphere.test.integration.sql.parser.loader.SQLCaseLoadStrategy;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.summary.FileSummary;
+import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.SQLCaseLoadStrategy;
 
 import java.net.URI;
 import java.util.Collection;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/AssertableFileSummary.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/AssertableFileSummary.java
similarity index 98%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/AssertableFileSummary.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/AssertableFileSummary.java
index 17726f51ab5..41c99cd158f 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/AssertableFileSummary.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/AssertableFileSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.integration.sql.parser.loader;
+package org.apache.shardingsphere.test.integration.sql.parser.loader.summary;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/FileSummary.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/FileSummary.java
similarity index 98%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/FileSummary.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/FileSummary.java
index d11de9776fe..1f4080164d0 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/FileSummary.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/summary/FileSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.integration.sql.parser.loader;
+package org.apache.shardingsphere.test.integration.sql.parser.loader.summary;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;