Refactor RepositoryTupleSwapper's impl (#31086)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
index d19c609..06284a8 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
@@ -57,8 +57,8 @@
}
@Override
- public Class<YamlBroadcastRuleConfiguration> getTypeClass() {
- return YamlBroadcastRuleConfiguration.class;
+ public String getRuleTypeName() {
+ return "broadcast";
}
@Override
@@ -67,7 +67,7 @@
}
@Override
- public String getRuleTypeName() {
- return "broadcast";
+ public Class<YamlBroadcastRuleConfiguration> getTypeClass() {
+ return YamlBroadcastRuleConfiguration.class;
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
index c3bbd08..2bd56bb 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
@@ -76,11 +76,6 @@
}
@Override
- public Class<YamlEncryptRuleConfiguration> getTypeClass() {
- return YamlEncryptRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "encrypt";
}
@@ -89,4 +84,9 @@
public int getOrder() {
return EncryptOrder.ORDER;
}
+
+ @Override
+ public Class<YamlEncryptRuleConfiguration> getTypeClass() {
+ return YamlEncryptRuleConfiguration.class;
+ }
}
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
index f3544b3..038db7b 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
@@ -75,11 +75,6 @@
}
@Override
- public Class<YamlMaskRuleConfiguration> getTypeClass() {
- return YamlMaskRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "mask";
}
@@ -88,4 +83,9 @@
public int getOrder() {
return MaskOrder.ORDER;
}
+
+ @Override
+ public Class<YamlMaskRuleConfiguration> getTypeClass() {
+ return YamlMaskRuleConfiguration.class;
+ }
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
index 9d53a55..0fd1be4 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
@@ -76,11 +76,6 @@
}
@Override
- public Class<YamlReadwriteSplittingRuleConfiguration> getTypeClass() {
- return YamlReadwriteSplittingRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "readwrite_splitting";
}
@@ -89,4 +84,9 @@
public int getOrder() {
return ReadwriteSplittingOrder.ORDER;
}
+
+ @Override
+ public Class<YamlReadwriteSplittingRuleConfiguration> getTypeClass() {
+ return YamlReadwriteSplittingRuleConfiguration.class;
+ }
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
index 470d014..3343284 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
@@ -91,11 +91,6 @@
}
@Override
- public Class<YamlShadowRuleConfiguration> getTypeClass() {
- return YamlShadowRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "shadow";
}
@@ -104,4 +99,9 @@
public int getOrder() {
return ShadowOrder.ORDER;
}
+
+ @Override
+ public Class<YamlShadowRuleConfiguration> getTypeClass() {
+ return YamlShadowRuleConfiguration.class;
+ }
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
index 5a6a127..17c22d3 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
@@ -158,11 +158,6 @@
}
@Override
- public Class<YamlShardingRuleConfiguration> getTypeClass() {
- return YamlShardingRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "sharding";
}
@@ -171,4 +166,9 @@
public int getOrder() {
return ShardingOrder.ORDER;
}
+
+ @Override
+ public Class<YamlShardingRuleConfiguration> getTypeClass() {
+ return YamlShardingRuleConfiguration.class;
+ }
}
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
index d96ecdb..914878a 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlAuthorityRuleConfiguration> getTypeClass() {
- return YamlAuthorityRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "authority";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return AuthorityOrder.ORDER;
}
+
+ @Override
+ public Class<YamlAuthorityRuleConfiguration> getTypeClass() {
+ return YamlAuthorityRuleConfiguration.class;
+ }
}
diff --git a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
index 007e402..e20082d 100644
--- a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlLoggingRuleConfiguration> getTypeClass() {
- return YamlLoggingRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "logging";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return LoggingOrder.ORDER;
}
+
+ @Override
+ public Class<YamlLoggingRuleConfiguration> getTypeClass() {
+ return YamlLoggingRuleConfiguration.class;
+ }
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
index 7f1268c..7e20756 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
@@ -53,11 +53,6 @@
}
@Override
- public Class<YamlSingleRuleConfiguration> getTypeClass() {
- return YamlSingleRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "single";
}
@@ -66,4 +61,9 @@
public int getOrder() {
return SingleOrder.ORDER;
}
+
+ @Override
+ public Class<YamlSingleRuleConfiguration> getTypeClass() {
+ return YamlSingleRuleConfiguration.class;
+ }
}
diff --git a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
index 5c461cd..bd5fdf1 100644
--- a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlSQLFederationRuleConfiguration> getTypeClass() {
- return YamlSQLFederationRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "sql_federation";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return SQLFederationOrder.ORDER;
}
+
+ @Override
+ public Class<YamlSQLFederationRuleConfiguration> getTypeClass() {
+ return YamlSQLFederationRuleConfiguration.class;
+ }
}
diff --git a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
index 9727517..4256387 100644
--- a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlSQLParserRuleConfiguration> getTypeClass() {
- return YamlSQLParserRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "sql_parser";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return SQLParserOrder.ORDER;
}
+
+ @Override
+ public Class<YamlSQLParserRuleConfiguration> getTypeClass() {
+ return YamlSQLParserRuleConfiguration.class;
+ }
}
diff --git a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
index 99c4fc7..aca0629 100644
--- a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlSQLTranslatorRuleConfiguration> getTypeClass() {
- return YamlSQLTranslatorRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "sql_translator";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return SQLTranslatorOrder.ORDER;
}
+
+ @Override
+ public Class<YamlSQLTranslatorRuleConfiguration> getTypeClass() {
+ return YamlSQLTranslatorRuleConfiguration.class;
+ }
}
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
index 91f00ef..19c8ee4 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlTrafficRuleConfiguration> getTypeClass() {
- return YamlTrafficRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "traffic";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return TrafficOrder.ORDER;
}
+
+ @Override
+ public Class<YamlTrafficRuleConfiguration> getTypeClass() {
+ return YamlTrafficRuleConfiguration.class;
+ }
}
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
index 3e6e925..0c38f9e 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
@@ -49,11 +49,6 @@
}
@Override
- public Class<YamlTransactionRuleConfiguration> getTypeClass() {
- return YamlTransactionRuleConfiguration.class;
- }
-
- @Override
public String getRuleTypeName() {
return "transaction";
}
@@ -62,4 +57,9 @@
public int getOrder() {
return TransactionOrder.ORDER;
}
+
+ @Override
+ public Class<YamlTransactionRuleConfiguration> getTypeClass() {
+ return YamlTransactionRuleConfiguration.class;
+ }
}
