You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2024/05/01 04:11:25 UTC
(shardingsphere) branch master updated: Refactor RepositoryTupleSwapper's impl (#31086)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 f7a9c4811f6 Refactor RepositoryTupleSwapper's impl (#31086)
f7a9c4811f6 is described below
commit f7a9c4811f66a69187c93bdfb7d24d1d5a3b81cc
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 1 12:11:18 2024 +0800
Refactor RepositoryTupleSwapper's impl (#31086)
---
.../BroadcastRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../EncryptRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../swapper/MaskRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
...dwriteSplittingRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../ShardingRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../AuthorityRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../LoggingRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../swapper/SingleRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../SQLFederationRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../SQLParserRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../TrafficRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
.../TransactionRuleConfigurationRepositoryTupleSwapper.java | 10 +++++-----
14 files changed, 69 insertions(+), 69 deletions(-)
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 d19c6093400..06284a87599 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 @@ public final class BroadcastRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public Class<YamlBroadcastRuleConfiguration> getTypeClass() {
- return YamlBroadcastRuleConfiguration.class;
+ public String getRuleTypeName() {
+ return "broadcast";
}
@Override
@@ -67,7 +67,7 @@ public final class BroadcastRuleConfigurationRepositoryTupleSwapper implements R
}
@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 c3bbd0885da..2bd56bb52ad 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
@@ -75,11 +75,6 @@ public final class EncryptRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.of(yamlRuleConfig);
}
- @Override
- public Class<YamlEncryptRuleConfiguration> getTypeClass() {
- return YamlEncryptRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "encrypt";
@@ -89,4 +84,9 @@ public final class EncryptRuleConfigurationRepositoryTupleSwapper implements Rep
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 f3544b3c985..038db7b4691 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
@@ -74,11 +74,6 @@ public final class MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
return Optional.of(yamlRuleConfig);
}
- @Override
- public Class<YamlMaskRuleConfiguration> getTypeClass() {
- return YamlMaskRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "mask";
@@ -88,4 +83,9 @@ public final class MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
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 9d53a55362e..0fd1be4ce55 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
@@ -75,11 +75,6 @@ public final class ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper imp
return Optional.of(yamlRuleConfig);
}
- @Override
- public Class<YamlReadwriteSplittingRuleConfiguration> getTypeClass() {
- return YamlReadwriteSplittingRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "readwrite_splitting";
@@ -89,4 +84,9 @@ public final class ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper imp
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 470d0141a04..3343284e7c7 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
@@ -90,11 +90,6 @@ public final class ShadowRuleConfigurationRepositoryTupleSwapper implements Repo
return Optional.of(yamlRuleConfig);
}
- @Override
- public Class<YamlShadowRuleConfiguration> getTypeClass() {
- return YamlShadowRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "shadow";
@@ -104,4 +99,9 @@ public final class ShadowRuleConfigurationRepositoryTupleSwapper implements Repo
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 5a6a127b623..17c22d3c2fd 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
@@ -157,11 +157,6 @@ public final class ShardingRuleConfigurationRepositoryTupleSwapper implements Re
return Optional.of(yamlRuleConfig);
}
- @Override
- public Class<YamlShardingRuleConfiguration> getTypeClass() {
- return YamlShardingRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "sharding";
@@ -171,4 +166,9 @@ public final class ShardingRuleConfigurationRepositoryTupleSwapper implements Re
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 d96ecdb9b6c..914878ac3ef 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
@@ -48,11 +48,6 @@ public final class AuthorityRuleConfigurationRepositoryTupleSwapper implements R
return Optional.empty();
}
- @Override
- public Class<YamlAuthorityRuleConfiguration> getTypeClass() {
- return YamlAuthorityRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "authority";
@@ -62,4 +57,9 @@ public final class AuthorityRuleConfigurationRepositoryTupleSwapper implements R
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 007e4020af2..e20082d2ee4 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
@@ -48,11 +48,6 @@ public final class LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.empty();
}
- @Override
- public Class<YamlLoggingRuleConfiguration> getTypeClass() {
- return YamlLoggingRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "logging";
@@ -62,4 +57,9 @@ public final class LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
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 7f1268cb627..7e207564387 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
@@ -52,11 +52,6 @@ public final class SingleRuleConfigurationRepositoryTupleSwapper implements Repo
return Optional.empty();
}
- @Override
- public Class<YamlSingleRuleConfiguration> getTypeClass() {
- return YamlSingleRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "single";
@@ -66,4 +61,9 @@ public final class SingleRuleConfigurationRepositoryTupleSwapper implements Repo
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 5c461cde782..bd5fdf19570 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
@@ -48,11 +48,6 @@ public final class SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
return Optional.empty();
}
- @Override
- public Class<YamlSQLFederationRuleConfiguration> getTypeClass() {
- return YamlSQLFederationRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "sql_federation";
@@ -62,4 +57,9 @@ public final class SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
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 9727517da68..4256387614c 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
@@ -48,11 +48,6 @@ public final class SQLParserRuleConfigurationRepositoryTupleSwapper implements R
return Optional.empty();
}
- @Override
- public Class<YamlSQLParserRuleConfiguration> getTypeClass() {
- return YamlSQLParserRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "sql_parser";
@@ -62,4 +57,9 @@ public final class SQLParserRuleConfigurationRepositoryTupleSwapper implements R
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 99c4fc78f7e..aca0629d53e 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
@@ -48,11 +48,6 @@ public final class SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
return Optional.empty();
}
- @Override
- public Class<YamlSQLTranslatorRuleConfiguration> getTypeClass() {
- return YamlSQLTranslatorRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "sql_translator";
@@ -62,4 +57,9 @@ public final class SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
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 91f00efbfb6..19c8ee4d0ac 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
@@ -48,11 +48,6 @@ public final class TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.empty();
}
- @Override
- public Class<YamlTrafficRuleConfiguration> getTypeClass() {
- return YamlTrafficRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "traffic";
@@ -62,4 +57,9 @@ public final class TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
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 3e6e9251e1a..0c38f9efe1d 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
@@ -48,11 +48,6 @@ public final class TransactionRuleConfigurationRepositoryTupleSwapper implements
return Optional.empty();
}
- @Override
- public Class<YamlTransactionRuleConfiguration> getTypeClass() {
- return YamlTransactionRuleConfiguration.class;
- }
-
@Override
public String getRuleTypeName() {
return "transaction";
@@ -62,4 +57,9 @@ public final class TransactionRuleConfigurationRepositoryTupleSwapper implements
public int getOrder() {
return TransactionOrder.ORDER;
}
+
+ @Override
+ public Class<YamlTransactionRuleConfiguration> getTypeClass() {
+ return YamlTransactionRuleConfiguration.class;
+ }
}