You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/11/17 16:38:27 UTC
[shardingsphere] branch master updated: Refactor SQLCase (#22248)
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 7019155d9cb Refactor SQLCase (#22248)
7019155d9cb is described below
commit 7019155d9cbbf731d244fd68188c652944f6121a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Nov 18 00:38:21 2022 +0800
Refactor SQLCase (#22248)
* Remove useless methods
* Refactor CasesRegistry
* Refactor Cases
* Refactor DistSQLCase
---
kernel/data-pipeline/cdc/pom.xml | 5 ++---
kernel/data-pipeline/scenario/pom.xml | 5 ++---
.../shardingsphere/test/sql/parser/internal/jaxb/Cases.java | 2 +-
.../test/sql/parser/internal/jaxb/CasesRegistry.java | 7 +++----
.../parser/internal/jaxb/cases/SQLParserTestCasesRegistry.java | 9 ---------
.../test/sql/parser/internal/jaxb/distsql/DistSQLCase.java | 4 ----
.../test/sql/parser/internal/jaxb/distsql/DistSQLCases.java | 2 +-
.../test/sql/parser/internal/jaxb/sql/SQLCase.java | 3 ---
.../test/sql/parser/internal/jaxb/sql/SQLCases.java | 4 ++--
.../test/sql/parser/internal/loader/CasesLoader.java | 9 ---------
10 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/kernel/data-pipeline/cdc/pom.xml b/kernel/data-pipeline/cdc/pom.xml
index 36b3e40febe..e6bd2d414a6 100644
--- a/kernel/data-pipeline/cdc/pom.xml
+++ b/kernel/data-pipeline/cdc/pom.xml
@@ -16,13 +16,12 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>shardingsphere-data-pipeline</artifactId>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-data-pipeline</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
<artifactId>shardingsphere-data-pipeline-cdc</artifactId>
diff --git a/kernel/data-pipeline/scenario/pom.xml b/kernel/data-pipeline/scenario/pom.xml
index 6b17088a92e..8f6ae22befd 100644
--- a/kernel/data-pipeline/scenario/pom.xml
+++ b/kernel/data-pipeline/scenario/pom.xml
@@ -16,13 +16,12 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>shardingsphere-data-pipeline</artifactId>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-data-pipeline</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
<artifactId>shardingsphere-data-pipeline-scenario</artifactId>
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/Cases.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/Cases.java
index db430699a7e..4494c85eb9e 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/Cases.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/Cases.java
@@ -20,5 +20,5 @@ package org.apache.shardingsphere.test.sql.parser.internal.jaxb;
/**
* Base cases.
*/
-public abstract class Cases {
+public interface Cases {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/CasesRegistry.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/CasesRegistry.java
index 9c18bbe1d3a..df9f6fe4196 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/CasesRegistry.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/CasesRegistry.java
@@ -24,16 +24,15 @@ import org.apache.shardingsphere.test.sql.parser.internal.jaxb.sql.loader.SQLCas
/**
* SQL cases registry.
*/
+@Getter
public final class CasesRegistry {
private static final CasesRegistry INSTANCE = new CasesRegistry();
private static final String CASE_PATH = "sql/supported/";
- @Getter
private final SQLCasesLoader sqlCasesLoader;
- @Getter
private final DistSQLCasesLoader distSQLCasesLoader;
private CasesRegistry() {
@@ -42,9 +41,9 @@ public final class CasesRegistry {
}
/**
- * Get singleton instance.
+ * Get instance.
*
- * @return singleton instance
+ * @return got instance
*/
public static CasesRegistry getInstance() {
return INSTANCE;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/SQLParserTestCasesRegistry.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/SQLParserTestCasesRegistry.java
index 1e4589eaa3c..32cc6b38916 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/SQLParserTestCasesRegistry.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/SQLParserTestCasesRegistry.java
@@ -93,13 +93,4 @@ public final class SQLParserTestCasesRegistry {
Preconditions.checkState(sqlParserTestCases.containsKey(sqlCaseId), "Can not find SQL of ID: %s", sqlCaseId);
return sqlParserTestCases.get(sqlCaseId);
}
-
- /**
- * Get all SQL case IDs.
- *
- * @return all SQL case IDs
- */
- public Collection<String> getAllSQLCaseIDs() {
- return sqlParserTestCases.keySet();
- }
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCase.java
index 333832b06e0..9b75965a6a8 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCase.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.test.sql.parser.internal.jaxb.distsql;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.Case;
import javax.xml.bind.annotation.XmlAccessType;
@@ -28,7 +26,5 @@ import javax.xml.bind.annotation.XmlAccessorType;
* DistSQL test case for xml tag.
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@Getter
-@Setter
public final class DistSQLCase extends Case {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCases.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCases.java
index c658e2a9ea2..7bcc63a5b49 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCases.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/distsql/DistSQLCases.java
@@ -30,7 +30,7 @@ import java.util.List;
*/
@XmlRootElement(name = "sql-cases")
@Getter
-public final class DistSQLCases extends Cases {
+public final class DistSQLCases implements Cases {
@XmlElement(name = "distsql-case")
private final List<DistSQLCase> distSQLCases = new LinkedList<>();
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCase.java
index 0a271123ec9..9dcdabc3093 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCase.java
@@ -35,7 +35,4 @@ public final class SQLCase extends Case {
@XmlAttribute(name = "db-types")
private String databaseTypes;
-
- @XmlAttribute(name = "rule-type")
- private String ruleType;
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCases.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCases.java
index a71bb437a3c..fa4601293a2 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCases.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/sql/SQLCases.java
@@ -31,11 +31,11 @@ import java.util.List;
*/
@XmlRootElement(name = "sql-cases")
@Getter
-public final class SQLCases extends Cases {
+public final class SQLCases implements Cases {
@XmlAttribute(name = "db-types")
private String databaseTypes;
@XmlElement(name = "sql-case")
- private List<SQLCase> sqlCases = new LinkedList<>();
+ private final List<SQLCase> sqlCases = new LinkedList<>();
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/CasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/CasesLoader.java
index 56db58f5b92..835a3d44e61 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/CasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/CasesLoader.java
@@ -93,13 +93,4 @@ public abstract class CasesLoader {
* @return SQL
*/
public abstract String getCaseValue(String sqlCaseId, SQLCaseType sqlCaseType, List<?> params, String databaseType);
-
- /**
- * Get all SQL case IDs.
- *
- * @return all SQL case IDs
- */
- public Collection<String> getAllSQLCaseIDs() {
- return cases.keySet();
- }
}