This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 9791e78ec21 Rename RepositoryTupleSwapper.getRuleTypeName (#31081)
9791e78ec21 is described below
commit 9791e78ec21cb71d0992b886256d344b1eaa061d
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Apr 30 20:32:10 2024 +0800
Rename RepositoryTupleSwapper.getRuleTypeName (#31081)
---
.../swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
...ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../rdl/rule/engine/database/type/DropDatabaseRuleOperator.java | 2 +-
.../swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../GlobalClockRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../persist/service/config/RepositoryTupleSwapperEngine.java | 2 +-
.../service/config/database/rule/DatabaseRulePersistService.java | 6 +++---
.../swapper/SingleRuleConfigurationRepositoryTupleSwapper.java | 4 ++--
.../SQLFederationRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../TransactionRuleConfigurationRepositoryTupleSwapper.java | 8 ++++----
.../apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java | 6 +++---
.../mode/manager/context/ConfigurationContextManager.java | 2 +-
20 files changed, 55 insertions(+), 55 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 a4bcb42e9a4..10e4167edfd 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
@@ -68,7 +68,7 @@ public final class
BroadcastRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public String getRuleTagName() {
- return "BROADCAST";
+ public String getRuleTypeName() {
+ return "broadcast";
}
}
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 4bbcbfe23e6..f831d2b5c57 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
@@ -82,8 +82,8 @@ public final class
EncryptRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public String getRuleTagName() {
- return "ENCRYPT";
+ public String getRuleTypeName() {
+ return "encrypt";
}
@Override
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 715683e0e37..1cb299e5231 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
@@ -81,8 +81,8 @@ public final class
MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
}
@Override
- public String getRuleTagName() {
- return "MASK";
+ public String getRuleTypeName() {
+ return "mask";
}
@Override
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 50a1e72df56..63b5dd855c8 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
@@ -82,8 +82,8 @@ public final class
ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper imp
}
@Override
- public String getRuleTagName() {
- return "READWRITE_SPLITTING";
+ public String getRuleTypeName() {
+ return "readwrite_splitting";
}
@Override
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 5f223ea1217..c4bea542a26 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
@@ -97,8 +97,8 @@ public final class
ShadowRuleConfigurationRepositoryTupleSwapper implements Repo
}
@Override
- public String getRuleTagName() {
- return "SHADOW";
+ public String getRuleTypeName() {
+ return "shadow";
}
@Override
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 f307c0709cd..756e0b0ac80 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
@@ -164,8 +164,8 @@ public final class
ShardingRuleConfigurationRepositoryTupleSwapper implements Re
}
@Override
- public String getRuleTagName() {
- return "SHARDING";
+ public String getRuleTypeName() {
+ return "sharding";
}
@Override
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
index f81641764fc..cf053ab9298 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
@@ -64,7 +64,7 @@ public final class DropDatabaseRuleOperator implements
DatabaseRuleOperator {
RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
if (null != toBeAlteredRuleConfig && ((DatabaseRuleConfiguration)
toBeAlteredRuleConfig).isEmpty()) {
OrderedSPILoader.getServices(RepositoryTupleSwapper.class,
Collections.singleton(currentRuleConfig)).values().stream().findFirst()
- .ifPresent(optional ->
modeContextManager.removeRuleConfiguration(database.getName(),
optional.getRuleTagName().toLowerCase()));
+ .ifPresent(optional ->
modeContextManager.removeRuleConfiguration(database.getName(),
optional.getRuleTypeName()));
return Collections.emptyList();
}
return modeContextManager.alterRuleConfiguration(database.getName(),
toBeAlteredRuleConfig);
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 a94512767b1..21cd74953be 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
@@ -36,13 +36,13 @@ public final class
AuthorityRuleConfigurationRepositoryTupleSwapper implements R
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlAuthorityRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlAuthorityRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlAuthorityRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
AuthorityRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public String getRuleTagName() {
- return "AUTHORITY";
+ public String getRuleTypeName() {
+ return "authority";
}
@Override
diff --git
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
index a2279f97897..ffa3bfaae56 100644
---
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
+++
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
@@ -36,13 +36,13 @@ public final class
GlobalClockRuleConfigurationRepositoryTupleSwapper implements
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlGlobalClockRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlGlobalClockRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlGlobalClockRuleConfiguration.class));
}
}
@@ -50,8 +50,8 @@ public final class
GlobalClockRuleConfigurationRepositoryTupleSwapper implements
}
@Override
- public String getRuleTagName() {
- return "GLOBAL_CLOCK";
+ public String getRuleTypeName() {
+ return "global_clock";
}
@Override
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 bf0832f2ad9..6b249899983 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
@@ -36,13 +36,13 @@ public final class
LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlLoggingRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlLoggingRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlLoggingRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public String getRuleTagName() {
- return "LOGGING";
+ public String getRuleTypeName() {
+ return "logging";
}
@Override
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
index 399f24b805f..fae7bdfd424 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
@@ -67,7 +67,7 @@ public final class RepositoryTupleSwapperEngine {
}
YamlRuleConfigurationSwapperEngine yamlSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
for (RepositoryTupleSwapper each :
OrderedSPILoader.getServices(RepositoryTupleSwapper.class)) {
- if (ruleName.equals(each.getRuleTagName().toLowerCase())) {
+ if (ruleName.equals(each.getRuleTypeName())) {
Optional<YamlRuleConfiguration> yamlRuleConfig =
each.swapToObject(repositoryTuples);
return
yamlRuleConfig.map(yamlSwapperEngine::swapToRuleConfiguration);
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
index 24a2e4dd915..5cd0ef22603 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
@@ -59,7 +59,7 @@ public final class DatabaseRulePersistService implements
DatabaseBasedPersistSer
for (Entry<RuleConfiguration, RepositoryTupleSwapper> entry :
OrderedSPILoader.getServices(RepositoryTupleSwapper.class, configs).entrySet())
{
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(yamlSwapperEngine.swapToYamlRuleConfiguration(entry.getKey()));
if (!repositoryTuples.isEmpty()) {
- persistDataNodes(databaseName,
entry.getValue().getRuleTagName().toLowerCase(), repositoryTuples);
+ persistDataNodes(databaseName,
entry.getValue().getRuleTypeName(), repositoryTuples);
}
}
}
@@ -82,7 +82,7 @@ public final class DatabaseRulePersistService implements
DatabaseBasedPersistSer
for (Entry<RuleConfiguration, RepositoryTupleSwapper> entry :
OrderedSPILoader.getServices(RepositoryTupleSwapper.class, configs).entrySet())
{
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(yamlSwapperEngine.swapToYamlRuleConfiguration(entry.getKey()));
if (!repositoryTuples.isEmpty()) {
- result.addAll(persistDataNodes(databaseName,
entry.getValue().getRuleTagName().toLowerCase(), repositoryTuples));
+ result.addAll(persistDataNodes(databaseName,
entry.getValue().getRuleTypeName(), repositoryTuples));
}
}
return result;
@@ -114,7 +114,7 @@ public final class DatabaseRulePersistService implements
DatabaseBasedPersistSer
}
List<RepositoryTuple> newRepositoryTuples = new
LinkedList<>(repositoryTuples);
Collections.reverse(newRepositoryTuples);
- result.addAll(deleteDataNodes(databaseName,
entry.getValue().getRuleTagName().toLowerCase(), newRepositoryTuples));
+ result.addAll(deleteDataNodes(databaseName,
entry.getValue().getRuleTypeName(), newRepositoryTuples));
}
return result;
}
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 b980235f0f0..85d73568e8d 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
@@ -59,8 +59,8 @@ public final class
SingleRuleConfigurationRepositoryTupleSwapper implements Repo
}
@Override
- public String getRuleTagName() {
- return "SINGLE";
+ public String getRuleTypeName() {
+ return "single";
}
@Override
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 ff653e69fc8..512b029cd3b 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
@@ -36,13 +36,13 @@ public final class
SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlSQLFederationRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlSQLFederationRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLFederationRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
}
@Override
- public String getRuleTagName() {
- return "SQL_FEDERATION";
+ public String getRuleTypeName() {
+ return "sql_federation";
}
@Override
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 19395810466..f4f7cd06f7b 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
@@ -36,13 +36,13 @@ public final class
SQLParserRuleConfigurationRepositoryTupleSwapper implements R
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlSQLParserRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlSQLParserRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLParserRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
SQLParserRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public String getRuleTagName() {
- return "SQL_PARSER";
+ public String getRuleTypeName() {
+ return "sql_parser";
}
@Override
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 176f45f2a6c..b337f62148f 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
@@ -36,13 +36,13 @@ public final class
SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlSQLTranslatorRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlSQLTranslatorRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLTranslatorRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
}
@Override
- public String getRuleTagName() {
- return "SQL_TRANSLATOR";
+ public String getRuleTypeName() {
+ return "sql_translator";
}
@Override
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 3d3e6133165..33d69e9686c 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
@@ -36,13 +36,13 @@ public final class
TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlTrafficRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlTrafficRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlTrafficRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public String getRuleTagName() {
- return "TRAFFIC";
+ public String getRuleTypeName() {
+ return "traffic";
}
@Override
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 ca2e6f0e813..073e0cff4a4 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
@@ -36,13 +36,13 @@ public final class
TransactionRuleConfigurationRepositoryTupleSwapper implements
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final
YamlTransactionRuleConfiguration yamlRuleConfig) {
- return Collections.singleton(new
RepositoryTuple(getRuleTagName().toLowerCase(),
YamlEngine.marshal(yamlRuleConfig)));
+ return Collections.singleton(new RepositoryTuple(getRuleTypeName(),
YamlEngine.marshal(yamlRuleConfig)));
}
@Override
public Optional<YamlTransactionRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
+ if (GlobalNodePath.getVersion(getRuleTypeName(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlTransactionRuleConfiguration.class));
}
}
@@ -55,8 +55,8 @@ public final class
TransactionRuleConfigurationRepositoryTupleSwapper implements
}
@Override
- public String getRuleTagName() {
- return "TRANSACTION";
+ public String getRuleTypeName() {
+ return "transaction";
}
@Override
diff --git
a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
index 8708fad12a5..134770808c3 100644
---
a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
@@ -52,9 +52,9 @@ public interface RepositoryTupleSwapper<T extends
RuleConfiguration, Y extends Y
Optional<Y> swapToObject(Collection<RepositoryTuple> repositoryTuples);
/**
- * Get YAML rule tag name.
+ * Get rule type name.
*
- * @return YAML rule tag name
+ * @return rule type name
*/
- String getRuleTagName();
+ String getRuleTypeName();
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index 60e1e477734..8544193461c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -378,7 +378,7 @@ public final class ConfigurationContextManager {
private void closeStaleTransactionRule(final RuleConfiguration ruleConfig)
{
for (Entry<RuleConfiguration, RepositoryTupleSwapper> entry :
OrderedSPILoader.getServices(
RepositoryTupleSwapper.class,
Collections.singleton(ruleConfig)).entrySet()) {
- if
("transaction".equalsIgnoreCase(entry.getValue().getRuleTagName())) {
+ if
("transaction".equalsIgnoreCase(entry.getValue().getRuleTypeName())) {
Optional<TransactionRule> transactionRule =
metaDataContexts.get().getMetaData().getGlobalRuleMetaData().findSingleRule(TransactionRule.class);
if (!transactionRule.isPresent()) {
return;
