This is an automated email from the ASF dual-hosted git repository.
panjuan 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 41bd67df828 Refactor GlobalRuleRALUpdater.getType() (#27960)
41bd67df828 is described below
commit 41bd67df8283c0670323904e0a607fe317ef1243
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 7 14:23:25 2023 +0800
Refactor GlobalRuleRALUpdater.getType() (#27960)
---
.../distsql/handler/ral/update/GlobalRuleRALUpdater.java | 4 ++++
.../distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java | 4 ++--
.../handler/update/AlterSQLFederationRuleStatementUpdater.java | 4 ++--
.../distsql/handler/update/AlterSQLParserRuleStatementUpdater.java | 4 ++--
.../distsql/handler/update/AlterTrafficRuleStatementUpdater.java | 4 ++--
.../distsql/handler/update/AlterTransactionRuleStatementUpdater.java | 4 ++--
.../handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java | 2 +-
.../handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java | 2 +-
8 files changed, 16 insertions(+), 12 deletions(-)
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
index 2c8fdc90bac..7c9e214f6b9 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.distsql.handler.ral.update;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
@@ -54,4 +55,7 @@ public interface GlobalRuleRALUpdater<T extends SQLStatement,
R extends RuleConf
* @return rule configuration class
*/
Class<R> getRuleConfigurationClass();
+
+ @Override
+ Class<? extends UpdatableGlobalRuleRALStatement> getType();
}
diff --git
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
index 04f8dc478c7..19e188bb6d7 100644
---
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
+++
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
@@ -41,7 +41,7 @@ public final class AlterGlobalClockRuleStatementUpdater
implements GlobalRuleRAL
}
@Override
- public String getType() {
- return AlterGlobalClockRuleStatement.class.getName();
+ public Class<AlterGlobalClockRuleStatement> getType() {
+ return AlterGlobalClockRuleStatement.class;
}
}
diff --git
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
index 888e2357f3b..8d0728934fc 100644
---
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
+++
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
@@ -53,7 +53,7 @@ public final class AlterSQLFederationRuleStatementUpdater
implements GlobalRuleR
}
@Override
- public String getType() {
- return AlterSQLFederationRuleStatement.class.getName();
+ public Class<AlterSQLFederationRuleStatement> getType() {
+ return AlterSQLFederationRuleStatement.class;
}
}
diff --git
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
index 86684ac7b24..73ba0e7af38 100644
---
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
+++
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
@@ -56,7 +56,7 @@ public final class AlterSQLParserRuleStatementUpdater
implements GlobalRuleRALUp
}
@Override
- public String getType() {
- return AlterSQLParserRuleStatement.class.getName();
+ public Class<AlterSQLParserRuleStatement> getType() {
+ return AlterSQLParserRuleStatement.class;
}
}
diff --git
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
index b1146461083..d972ce20db9 100644
---
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
+++
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
@@ -118,7 +118,7 @@ public final class AlterTrafficRuleStatementUpdater
implements GlobalRuleRALUpda
}
@Override
- public String getType() {
- return AlterTrafficRuleStatement.class.getName();
+ public Class<AlterTrafficRuleStatement> getType() {
+ return AlterTrafficRuleStatement.class;
}
}
diff --git
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
index 366c4d6b0a0..c29da5bf526 100644
---
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
+++
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
@@ -79,7 +79,7 @@ public final class AlterTransactionRuleStatementUpdater
implements GlobalRuleRAL
}
@Override
- public String getType() {
- return AlterTransactionRuleStatement.class.getName();
+ public Class<AlterTransactionRuleStatement> getType() {
+ return AlterTransactionRuleStatement.class;
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
index 474db42473a..4157f0bf922 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
@@ -43,7 +43,7 @@ public final class NewUpdatableGlobalRuleRALBackendHandler
implements DistSQLBac
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public ResponseHeader execute() {
- GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class,
sqlStatement.getClass().getName());
+ GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
Collection<RuleConfiguration> ruleConfigurations =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
index 1bb394d6434..d483e614ea2 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
@@ -44,7 +44,7 @@ public final class UpdatableGlobalRuleRALBackendHandler
implements DistSQLBacken
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public ResponseHeader execute() {
- GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class,
sqlStatement.getClass().getName());
+ GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
Collection<RuleConfiguration> ruleConfigurations =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
