Refactor DistSQLParserFacade (#29632)

features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return BroadcastDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "broadcast";
-    }
 }

features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return EncryptDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "encrypt";
-    }
 }

features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return MaskDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "mask";
-    }
 }

features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return ReadwriteSplittingDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "readwrite-splitting";
-    }
 }

features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return ShadowDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "shadow";
-    }
 }

features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java

@@ -18,17 +18,15 @@
 package org.apache.shardingsphere.sharding.distsql.update;
 
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException;
-import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
 import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
 import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
 import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
 import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
 import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
@@ -290,7 +288,7 @@ private Map<String, DataSource> createDataSource() {
     private DistSQLStatement getDistSQLStatement(final String sql) {
         ShardingDistSQLParserFacade facade = new ShardingDistSQLParserFacade();
         ParseASTNode parseASTNode = (ParseASTNode) SQLParserFactory.newInstance(sql, facade.getLexerClass(), facade.getParserClass()).parse();
-        SQLVisitor visitor = TypedSPILoader.getService(DistSQLParserFacade.class, facade.getType()).getVisitorClass().getDeclaredConstructor().newInstance();
+        SQLVisitor visitor = facade.getVisitorClass().getDeclaredConstructor().newInstance();
         return (DistSQLStatement) visitor.visit(parseASTNode.getRootNode());
     }
 

features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return ShardingDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "sharding";
-    }
 }

kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return AuthorityDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "authority";
-    }
 }

kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return CDCDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "CDC";
-    }
 }

kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return MigrationDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "migration";
-    }
 }

kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return GlobalClockDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "global_clock";
-    }
 }

kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return SingleDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "single";
-    }
 }

kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return SQLFederationDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "sql_federation";
-    }
 }

kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return SQLParserDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "sql_parser";
-    }
 }

kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return SQLTranslatorDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "sql_translator";
-    }
 }

kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return TrafficDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "traffic";
-    }
 }

kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLParserFacade.java

@@ -45,9 +45,4 @@ public Class<? extends SQLParser> getParserClass() {
     public Class<? extends SQLVisitor<ASTNode>> getVisitorClass() {
         return TransactionDistSQLStatementVisitor.class;
     }
-
-    @Override
-    public String getType() {
-        return "transaction";
-    }
 }

parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java → parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/DistSQLParserEngine.java

@@ -29,9 +29,9 @@
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * Featured DistSQL statement parser engine.
+ * DistSQL parser engine.
  */
-public final class FeaturedDistSQLStatementParserEngine {
+public final class DistSQLParserEngine {
 
     /**
      * Parse SQL.

parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java

@@ -20,7 +20,7 @@
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.apache.shardingsphere.distsql.parser.core.utility.UtilityDistSQLStatementParserEngine;
 import org.apache.shardingsphere.distsql.parser.core.kernel.KernelDistSQLStatementParserEngine;
-import org.apache.shardingsphere.distsql.parser.core.featured.FeaturedDistSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.core.featured.DistSQLParserEngine;
 import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
@@ -40,7 +40,7 @@ public SQLStatement parse(final String sql) {
             return new KernelDistSQLStatementParserEngine().parse(sql);
         } catch (final ParseCancellationException | SQLParsingException ignored) {
             try {
-                return new FeaturedDistSQLStatementParserEngine().parse(sql);
+                return new DistSQLParserEngine().parse(sql);
             } catch (final SQLParsingException ignoredToo) {
                 return new UtilityDistSQLStatementParserEngine().parse(sql);
             }

parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/DistSQLParserFacade.java

@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.distsql.parser.engine.spi;
 
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -28,7 +27,7 @@
  * DistSQL parser facade.
  */
 @SingletonSPI
-public interface DistSQLParserFacade extends TypedSPI {
+public interface DistSQLParserFacade {
 
     /**
      * Get SQL lexer class type.
@@ -50,7 +49,4 @@ public interface DistSQLParserFacade extends TypedSPI {
      * @return visitor class
      */
     Class<? extends SQLVisitor<ASTNode>> getVisitorClass();
-
-    @Override
-    String getType();
 }