This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 0b6ea8a12a7 Refactor ConvertRuleConfigurationProvider.getType()
(#27951)
0b6ea8a12a7 is described below
commit 0b6ea8a12a761e50e3883cc26ffc4cda60bcbe4d
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 7 00:11:17 2023 +0800
Refactor ConvertRuleConfigurationProvider.getType() (#27951)
* Refactor ConvertRuleConfigurationProvider.getType()
* Refactor ConvertRuleConfigurationProvider.getType()
---
.../handler/provider/EncryptConvertRuleConfigurationProvider.java | 4 ++--
.../handler/provider/MaskConvertRuleConfigurationProvider.java | 4 ++--
.../provider/ReadwriteSplittingConvertRuleConfigurationProvider.java | 4 ++--
.../handler/provider/ShadowConvertRuleConfigurationProvider.java | 4 ++--
.../handler/provider/ShardingConvertRuleConfigurationProvider.java | 4 ++--
.../distsql/handler/ral/query/ConvertRuleConfigurationProvider.java | 3 +++
.../distsql/ral/queryable/ConvertYamlConfigurationExecutor.java | 4 ++--
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
index 56a5565aa66..89a74f7e6bc 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
@@ -105,7 +105,7 @@ public final class EncryptConvertRuleConfigurationProvider
implements ConvertRul
}
@Override
- public String getType() {
- return EncryptRuleConfiguration.class.getName();
+ public Class<EncryptRuleConfiguration> getType() {
+ return EncryptRuleConfiguration.class;
}
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
index 4e070b82528..1f45419f9b7 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
@@ -71,7 +71,7 @@ public final class MaskConvertRuleConfigurationProvider
implements ConvertRuleCo
}
@Override
- public String getType() {
- return MaskRuleConfiguration.class.getName();
+ public Class<MaskRuleConfiguration> getType() {
+ return MaskRuleConfiguration.class;
}
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
index 90192786423..c74bb28aebf 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
@@ -86,7 +86,7 @@ public final class
ReadwriteSplittingConvertRuleConfigurationProvider implements
}
@Override
- public String getType() {
- return ReadwriteSplittingRuleConfiguration.class.getName();
+ public Class<ReadwriteSplittingRuleConfiguration> getType() {
+ return ReadwriteSplittingRuleConfiguration.class;
}
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
index b557b26a3a8..62abc2c1931 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
@@ -87,7 +87,7 @@ public final class ShadowConvertRuleConfigurationProvider
implements ConvertRule
}
@Override
- public String getType() {
- return ShadowRuleConfiguration.class.getName();
+ public Class<ShadowRuleConfiguration> getType() {
+ return ShadowRuleConfiguration.class;
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
index 53b10d5fddd..36d78c9276c 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
@@ -208,7 +208,7 @@ public final class ShardingConvertRuleConfigurationProvider
implements ConvertRu
}
@Override
- public String getType() {
- return ShardingRuleConfiguration.class.getName();
+ public Class<ShardingRuleConfiguration> getType() {
+ return ShardingRuleConfiguration.class;
}
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/ConvertRuleConfigurationProvider.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/ConvertRuleConfigurationProvider.java
index 2c0a3f1c519..96b28399860 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/ConvertRuleConfigurationProvider.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/ConvertRuleConfigurationProvider.java
@@ -84,4 +84,7 @@ public interface ConvertRuleConfigurationProvider extends
TypedSPI {
}
return result.toString();
}
+
+ @Override
+ Class<? extends RuleConfiguration> getType();
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
index 1ca45af1ed3..5a4306cdd84 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
@@ -81,9 +81,9 @@ public final class ConvertYamlConfigurationExecutor
implements QueryableRALExecu
StringBuilder result = new StringBuilder();
appendResourceDistSQL(yamlConfig, result);
for (RuleConfiguration each : swapToRuleConfigs(yamlConfig).values()) {
- String type = each.getClass().getName();
+ Class<? extends RuleConfiguration> type = each.getClass();
if (each instanceof CompatibleEncryptRuleConfiguration) {
- type = ((CompatibleEncryptRuleConfiguration)
each).convertToEncryptRuleConfiguration().getClass().getName();
+ type = ((CompatibleEncryptRuleConfiguration)
each).convertToEncryptRuleConfiguration().getClass();
}
ConvertRuleConfigurationProvider convertRuleConfigProvider =
TypedSPILoader.getService(ConvertRuleConfigurationProvider.class, type);
result.append(convertRuleConfigProvider.convert(each));
