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 a57192bf1d2 Rename YamlRepositoryTupleSwapperEngine (#34442)
a57192bf1d2 is described below
commit a57192bf1d21f0eead6df05a4a3336d408badbec
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 23 19:03:17 2025 +0800
Rename YamlRepositoryTupleSwapperEngine (#34442)
---
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
...urationYamlRepositoryTupleSwapperEngineIT.java} | 6 ++--
.../database/DataSourceUnitPersistService.java | 7 +++--
.../database/DatabaseRulePersistService.java | 20 ++++++++-----
.../config/global/GlobalRulePersistService.java | 17 +++++++----
....java => YamlRepositoryTupleSwapperEngine.java} | 4 +--
...a => YamlRepositoryTupleSwapperEngineTest.java} | 34 +++++++++++-----------
...ava => YamlRepositoryTupleSwapperEngineIT.java} | 10 +++----
20 files changed, 94 insertions(+), 82 deletions(-)
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 86%
rename from
features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 6f03dee226b..3f5c5696b8d 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/BroadcastRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,16 +20,16 @@ package org.apache.shardingsphere.broadcast.yaml;
import
org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class BroadcastRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ BroadcastRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/broadcast-rule.yaml");
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 89%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 70d8d228e95..1117e9cfa58 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/EncryptConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,16 +20,16 @@ package org.apache.shardingsphere.encrypt.yaml;
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class EncryptConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class EncryptConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- EncryptConfigurationRepositoryTupleSwapperEngineIT() {
+ EncryptConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/encrypt-rule.yaml");
}
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationRepositoryTupleSwapperEngineIT.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 89%
rename from
features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 8e979f7aff0..62b4a9192f0 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/MaskConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,16 +20,16 @@ package org.apache.shardingsphere.mask.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.mask.yaml.config.YamlMaskRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class MaskConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class MaskConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- MaskConfigurationRepositoryTupleSwapperEngineIT() {
+ MaskConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/mask-rule.yaml");
}
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 89%
rename from
features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 4d9db8cb255..64c934c6a4d 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/ReadwriteSplittingConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,16 +20,16 @@ package org.apache.shardingsphere.readwritesplitting.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class ReadwriteSplittingConfigurationYamlRepositoryTupleSwapperEngineIT
extends YamlRepositoryTupleSwapperEngineIT {
- ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT() {
+ ReadwriteSplittingConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/readwrite-splitting-rule.yaml");
}
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 92%
rename from
features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index ca5f698a33b..0964838c2a3 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/ShadowRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shadow.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +28,9 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ShadowRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class ShadowRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- ShadowRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ ShadowRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/shadow-rule.yaml");
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 95%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRepositoryTupleSwapperEngineIT.java
index d478e917e7b..b04a31c24c1 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +28,9 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ShardingConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class ShardingConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- ShardingConfigurationRepositoryTupleSwapperEngineIT() {
+ ShardingConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/sharding-rule-for-tuple.yaml");
}
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 9b394840223..87e8809cfb4 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/AuthorityRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.authority.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class AuthorityRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ AuthorityRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/authority-rule.yaml");
}
diff --git
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 9a906f9be85..0c51aa80808 100644
---
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/yaml/GlobalClockRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.globalclock.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class GlobalClockRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ GlobalClockRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/global-clock-rule.yaml");
}
diff --git
a/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 84de0067f8c..5de72ec07e6 100644
---
a/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/yaml/LoggingRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.logging.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class LoggingRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class LoggingRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- LoggingRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ LoggingRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/logging-rule.yaml");
}
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 87%
rename from
kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index fade2974fde..e9ea43eec66 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/yaml/SingleRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -20,16 +20,16 @@ package org.apache.shardingsphere.single.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.single.yaml.config.YamlSingleRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SingleRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class SingleRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- SingleRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ SingleRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/single-rule.yaml");
}
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 84%
rename from
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 8cc8fbba774..10793c78a45 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/yaml/SQLFederationRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.sqlfederation.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class SQLFederationRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ SQLFederationRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/sql-federation-rule.yaml");
}
diff --git
a/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index afbc4df413f..0abba1dbd55 100644
---
a/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/SQLParserRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.parser.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class SQLParserRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ SQLParserRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/sql-parser-rule.yaml");
}
diff --git
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 84%
rename from
kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index bdfb1333f02..57b96642dae 100644
---
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/yaml/SQLTranslatorRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.sqltranslator.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class SQLTranslatorRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ SQLTranslatorRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/sql-translator-rule.yaml");
}
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
rename to
kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
index 83992fb9abc..35f5d9ed8a9 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/yaml/TransactionRuleConfigurationYamlRepositoryTupleSwapperEngineIT.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.transaction.yaml;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
+import
org.apache.shardingsphere.test.it.yaml.YamlRepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class TransactionRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
+class TransactionRuleConfigurationYamlRepositoryTupleSwapperEngineIT extends
YamlRepositoryTupleSwapperEngineIT {
- TransactionRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ TransactionRuleConfigurationYamlRepositoryTupleSwapperEngineIT() {
super("yaml/transaction-rule.yaml");
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index 419abc68c88..7da1f0bc61b 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -43,9 +43,12 @@ public final class DataSourceUnitPersistService {
private final MetaDataVersionPersistService metaDataVersionPersistService;
+ private final YamlDataSourceConfigurationSwapper
yamlDataSourceConfigurationSwapper;
+
public DataSourceUnitPersistService(final PersistRepository repository) {
this.repository = repository;
metaDataVersionPersistService = new
MetaDataVersionPersistService(repository);
+ yamlDataSourceConfigurationSwapper = new
YamlDataSourceConfigurationSwapper();
}
/**
@@ -69,7 +72,7 @@ public final class DataSourceUnitPersistService {
@SuppressWarnings("unchecked")
public DataSourcePoolProperties load(final String databaseName, final
String dataSourceName) {
String dataSourceValue =
repository.query(DataSourceMetaDataNodePath.getStorageUnitVersionPath(databaseName,
dataSourceName, getDataSourceActiveVersion(databaseName, dataSourceName)));
- return new
YamlDataSourceConfigurationSwapper().swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceValue,
Map.class));
+ return
yamlDataSourceConfigurationSwapper.swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceValue,
Map.class));
}
/**
@@ -86,7 +89,7 @@ public final class DataSourceUnitPersistService {
List<String> versions =
metaDataVersionPersistService.getVersions(DataSourceMetaDataNodePath.getStorageUnitVersionsPath(databaseName,
entry.getKey()));
String nextActiveVersion = versions.isEmpty() ?
MetaDataVersion.DEFAULT_VERSION :
String.valueOf(Integer.parseInt(versions.get(0)) + 1);
repository.persist(DataSourceMetaDataNodePath.getStorageUnitVersionPath(databaseName,
entry.getKey(), nextActiveVersion),
- YamlEngine.marshal(new
YamlDataSourceConfigurationSwapper().swapToMap(entry.getValue())));
+
YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
if (Strings.isNullOrEmpty(activeVersion)) {
repository.persist(DataSourceMetaDataNodePath.getStorageUnitActiveVersionPath(databaseName,
entry.getKey()), MetaDataVersion.DEFAULT_VERSION);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index 07a544f60f5..5a4cb4db0bb 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePer
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
-import org.apache.shardingsphere.mode.node.tuple.RepositoryTupleSwapperEngine;
+import
org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
import
org.apache.shardingsphere.mode.node.tuple.annotation.RepositoryTupleEntity;
import java.util.Collection;
@@ -47,10 +47,16 @@ public final class DatabaseRulePersistService {
private final MetaDataVersionPersistService metaDataVersionPersistService;
+ private final YamlRepositoryTupleSwapperEngine
yamlRepositoryTupleSwapperEngine;
+
+ private final YamlRuleConfigurationSwapperEngine
yamlRuleConfigurationSwapperEngine;
+
public DatabaseRulePersistService(final PersistRepository repository) {
this.repository = repository;
repositoryTuplePersistService = new
RepositoryTuplePersistService(repository);
metaDataVersionPersistService = new
MetaDataVersionPersistService(repository);
+ yamlRepositoryTupleSwapperEngine = new
YamlRepositoryTupleSwapperEngine();
+ yamlRuleConfigurationSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
}
/**
@@ -60,7 +66,7 @@ public final class DatabaseRulePersistService {
* @return configurations
*/
public Collection<RuleConfiguration> load(final String databaseName) {
- return new
RepositoryTupleSwapperEngine().swapToRuleConfigurations(repositoryTuplePersistService.load(DatabaseRuleMetaDataNodePath.getRootPath(databaseName)));
+ return
yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(DatabaseRuleMetaDataNodePath.getRootPath(databaseName)));
}
/**
@@ -72,9 +78,8 @@ public final class DatabaseRulePersistService {
*/
public Collection<MetaDataVersion> persist(final String databaseName,
final Collection<RuleConfiguration> configs) {
Collection<MetaDataVersion> result = new LinkedList<>();
- RepositoryTupleSwapperEngine repositoryTupleSwapperEngine = new
RepositoryTupleSwapperEngine();
- for (YamlRuleConfiguration each : new
YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs)) {
- Collection<RepositoryTuple> repositoryTuples =
repositoryTupleSwapperEngine.swapToRepositoryTuples(each);
+ for (YamlRuleConfiguration each :
yamlRuleConfigurationSwapperEngine.swapToYamlRuleConfigurations(configs)) {
+ Collection<RepositoryTuple> repositoryTuples =
yamlRepositoryTupleSwapperEngine.swapToRepositoryTuples(each);
if (!repositoryTuples.isEmpty()) {
result.addAll(persistDataNodes(databaseName,
Objects.requireNonNull(each.getClass().getAnnotation(RepositoryTupleEntity.class)).value(),
repositoryTuples));
}
@@ -119,9 +124,8 @@ public final class DatabaseRulePersistService {
*/
public Collection<MetaDataVersion> delete(final String databaseName, final
Collection<RuleConfiguration> configs) {
Collection<MetaDataVersion> result = new LinkedList<>();
- RepositoryTupleSwapperEngine repositoryTupleSwapperEngine = new
RepositoryTupleSwapperEngine();
- for (YamlRuleConfiguration each : new
YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs)) {
- Collection<RepositoryTuple> repositoryTuples =
repositoryTupleSwapperEngine.swapToRepositoryTuples(each);
+ for (YamlRuleConfiguration each :
yamlRuleConfigurationSwapperEngine.swapToYamlRuleConfigurations(configs)) {
+ Collection<RepositoryTuple> repositoryTuples =
yamlRepositoryTupleSwapperEngine.swapToRepositoryTuples(each);
if (repositoryTuples.isEmpty()) {
continue;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index f8f065e3bef..58f28640e21 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPe
import org.apache.shardingsphere.mode.node.path.GlobalRuleNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
-import org.apache.shardingsphere.mode.node.tuple.RepositoryTupleSwapperEngine;
+import
org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
import java.util.Collection;
import java.util.LinkedList;
@@ -45,10 +45,16 @@ public final class GlobalRulePersistService {
private final RepositoryTuplePersistService repositoryTuplePersistService;
+ private final YamlRepositoryTupleSwapperEngine
yamlRepositoryTupleSwapperEngine;
+
+ private final YamlRuleConfigurationSwapperEngine
yamlRuleConfigurationSwapperEngine;
+
public GlobalRulePersistService(final PersistRepository repository, final
MetaDataVersionPersistService metaDataVersionPersistService) {
this.repository = repository;
this.metaDataVersionPersistService = metaDataVersionPersistService;
repositoryTuplePersistService = new
RepositoryTuplePersistService(repository);
+ yamlRepositoryTupleSwapperEngine = new
YamlRepositoryTupleSwapperEngine();
+ yamlRuleConfigurationSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
}
/**
@@ -57,7 +63,7 @@ public final class GlobalRulePersistService {
* @return global rule configurations
*/
public Collection<RuleConfiguration> load() {
- return new
RepositoryTupleSwapperEngine().swapToRuleConfigurations(repositoryTuplePersistService.load(GlobalRuleNodePath.getRootPath()));
+ return
yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(GlobalRuleNodePath.getRootPath()));
}
/**
@@ -67,7 +73,7 @@ public final class GlobalRulePersistService {
* @return global rule configuration
*/
public Optional<RuleConfiguration> load(final String ruleTypeName) {
- return new
RepositoryTupleSwapperEngine().swapToRuleConfiguration(ruleTypeName,
repositoryTuplePersistService.load(GlobalRuleNodePath.getRulePath(ruleTypeName)));
+ return
yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleTypeName,
repositoryTuplePersistService.load(GlobalRuleNodePath.getRulePath(ruleTypeName)));
}
/**
@@ -77,9 +83,8 @@ public final class GlobalRulePersistService {
*/
public void persist(final Collection<RuleConfiguration> globalRuleConfigs)
{
Collection<MetaDataVersion> metaDataVersions = new LinkedList<>();
- RepositoryTupleSwapperEngine repositoryTupleSwapperEngine = new
RepositoryTupleSwapperEngine();
- for (YamlRuleConfiguration each : new
YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs))
{
-
metaDataVersions.addAll(persistTuples(repositoryTupleSwapperEngine.swapToRepositoryTuples(each)));
+ for (YamlRuleConfiguration each :
yamlRuleConfigurationSwapperEngine.swapToYamlRuleConfigurations(globalRuleConfigs))
{
+
metaDataVersions.addAll(persistTuples(yamlRepositoryTupleSwapperEngine.swapToRepositoryTuples(each)));
}
metaDataVersionPersistService.switchActiveVersion(metaDataVersions);
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngine.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
similarity index 99%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngine.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
index a83520c33bc..dfcedeb0ba3 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngine.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
@@ -51,9 +51,9 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Repository tuple swapper engine.
+ * YAML repository tuple swapper engine.
*/
-public final class RepositoryTupleSwapperEngine {
+public final class YamlRepositoryTupleSwapperEngine {
/**
* Swap to repository tuples.
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngineTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngineTest.java
similarity index 76%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngineTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngineTest.java
index 8e83c78dfcb..40257681c6d 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/RepositoryTupleSwapperEngineTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngineTest.java
@@ -37,16 +37,16 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class RepositoryTupleSwapperEngineTest {
+class YamlRepositoryTupleSwapperEngineTest {
@Test
void assertSwapToRepositoryTuplesWithoutRepositoryTupleEntityAnnotation() {
- assertTrue(new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(new
NoneYamlRuleConfiguration()).isEmpty());
+ assertTrue(new
YamlRepositoryTupleSwapperEngine().swapToRepositoryTuples(new
NoneYamlRuleConfiguration()).isEmpty());
}
@Test
void assertSwapToRepositoryTuplesWithLeafYamlRuleConfiguration() {
- Collection<RepositoryTuple> actual = new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(new
LeafYamlRuleConfiguration("foo"));
+ Collection<RepositoryTuple> actual = new
YamlRepositoryTupleSwapperEngine().swapToRepositoryTuples(new
LeafYamlRuleConfiguration("foo"));
assertThat(actual.size(), is(1));
RepositoryTuple actualTuple = actual.iterator().next();
assertThat(actualTuple.getKey(), is("leaf"));
@@ -55,7 +55,7 @@ class RepositoryTupleSwapperEngineTest {
@Test
void assertSwapToRepositoryTuplesWithEmptyNodeYamlRuleConfiguration() {
- assertTrue(new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(new
NodeYamlRuleConfiguration()).isEmpty());
+ assertTrue(new
YamlRepositoryTupleSwapperEngine().swapToRepositoryTuples(new
NodeYamlRuleConfiguration()).isEmpty());
}
@Test
@@ -73,7 +73,7 @@ class RepositoryTupleSwapperEngineTest {
yamlRuleConfig.setLeaf(leaf);
yamlRuleConfig.setGens(Collections.singleton("value"));
yamlRuleConfig.setGen("single_gen");
- List<RepositoryTuple> actual = new ArrayList<>(new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(yamlRuleConfig));
+ List<RepositoryTuple> actual = new ArrayList<>(new
YamlRepositoryTupleSwapperEngine().swapToRepositoryTuples(yamlRuleConfig));
assertThat(actual.size(), is(10));
assertThat(actual.get(0).getKey(), is("map_value/k"));
assertThat(actual.get(0).getValue(), is("value: v" +
System.lineSeparator()));
@@ -99,17 +99,17 @@ class RepositoryTupleSwapperEngineTest {
@Test
void
assertSwapToYamlRuleConfigurationWithoutRepositoryTupleEntityAnnotation() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.emptyList(),
NoneYamlRuleConfiguration.class).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.emptyList(),
NoneYamlRuleConfiguration.class).isPresent());
}
@Test
void
assertSwapToYamlRuleConfigurationWithoutGlobalLeafYamlRuleConfiguration() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.singleton(new
RepositoryTuple("invalid", "")),
GlobalLeafYamlRuleConfiguration.class).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.singleton(new
RepositoryTuple("invalid", "")),
GlobalLeafYamlRuleConfiguration.class).isPresent());
}
@Test
void
assertSwapToYamlRuleConfigurationWithGlobalLeafYamlRuleConfiguration() {
- Optional<YamlRuleConfiguration> actual = new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
+ Optional<YamlRuleConfiguration> actual = new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
Collections.singleton(new
RepositoryTuple("/rules/leaf/versions/0", "value: foo")),
GlobalLeafYamlRuleConfiguration.class);
assertTrue(actual.isPresent());
GlobalLeafYamlRuleConfiguration actualYamlConfig =
(GlobalLeafYamlRuleConfiguration) actual.get();
@@ -118,19 +118,19 @@ class RepositoryTupleSwapperEngineTest {
@Test
void
assertSwapToYamlRuleConfigurationWithInvalidLeafYamlRuleConfiguration() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.singleton(new
RepositoryTuple("/invalid", "foo")),
LeafYamlRuleConfiguration.class).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Collections.singleton(new
RepositoryTuple("/invalid", "foo")),
LeafYamlRuleConfiguration.class).isPresent());
}
@Test
void
assertSwapToYamlRuleConfigurationWithInvalidNodeYamlRuleConfiguration() {
- Optional<YamlRuleConfiguration> actual = new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
+ Optional<YamlRuleConfiguration> actual = new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
Collections.singleton(new RepositoryTuple("/invalid", "foo")),
NodeYamlRuleConfiguration.class);
assertFalse(actual.isPresent());
}
@Test
void assertSwapToYamlRuleConfigurationWithEmptyNodeYamlRuleConfiguration()
{
- Optional<YamlRuleConfiguration> actual = new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
+ Optional<YamlRuleConfiguration> actual = new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(
Collections.singleton(new
RepositoryTuple("/metadata/foo_db/rules/node/string_value/versions/0", "")),
NodeYamlRuleConfiguration.class);
assertTrue(actual.isPresent());
NodeYamlRuleConfiguration actualYamlConfig =
(NodeYamlRuleConfiguration) actual.get();
@@ -139,7 +139,7 @@ class RepositoryTupleSwapperEngineTest {
@Test
void assertSwapToYamlRuleConfigurationWithNodeYamlRuleConfiguration() {
- Optional<YamlRuleConfiguration> actual = new
RepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Arrays.asList(
+ Optional<YamlRuleConfiguration> actual = new
YamlRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Arrays.asList(
new
RepositoryTuple("/metadata/foo_db/rules/node/map_value/k/versions/0", "v"),
new
RepositoryTuple("/metadata/foo_db/rules/node/collection_value/versions/0", "-
!LEAF" + System.lineSeparator() + " value: foo"),
new
RepositoryTuple("/metadata/foo_db/rules/node/string_value/versions/0", "str"),
@@ -162,26 +162,26 @@ class RepositoryTupleSwapperEngineTest {
@Test
void assertSwapToEmptyRuleConfigurations() {
- assertTrue(new
RepositoryTupleSwapperEngine().swapToRuleConfigurations(Collections.emptyList()).isEmpty());
+ assertTrue(new
YamlRepositoryTupleSwapperEngine().swapToRuleConfigurations(Collections.emptyList()).isEmpty());
}
@Test
void assertSwapToRuleConfigurations() {
- assertTrue(new
RepositoryTupleSwapperEngine().swapToRuleConfigurations(Collections.singleton(new
RepositoryTuple("/rules/leaf/versions/0", "value: foo"))).isEmpty());
+ assertTrue(new
YamlRepositoryTupleSwapperEngine().swapToRuleConfigurations(Collections.singleton(new
RepositoryTuple("/rules/leaf/versions/0", "value: foo"))).isEmpty());
}
@Test
void assertSwapToEmptyRuleConfiguration() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToRuleConfiguration("leaf",
Collections.emptyList()).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToRuleConfiguration("leaf",
Collections.emptyList()).isPresent());
}
@Test
void assertSwapToNotFoundRuleConfiguration() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToRuleConfiguration("invalid",
Collections.singleton(new RepositoryTuple("/rules/leaf/versions/0", "value:
foo"))).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToRuleConfiguration("invalid",
Collections.singleton(new RepositoryTuple("/rules/leaf/versions/0", "value:
foo"))).isPresent());
}
@Test
void assertSwapToRuleConfiguration() {
- assertFalse(new
RepositoryTupleSwapperEngine().swapToRuleConfiguration("leaf",
Collections.singleton(new RepositoryTuple("/rules/leaf/versions/0", "value:
foo"))).isPresent());
+ assertFalse(new
YamlRepositoryTupleSwapperEngine().swapToRuleConfiguration("leaf",
Collections.singleton(new RepositoryTuple("/rules/leaf/versions/0", "value:
foo"))).isPresent());
}
}
diff --git
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
similarity index 94%
rename from
test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
rename to
test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
index fc3f21883f7..4a386df4407 100644
---
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
+++
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlGlobalRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
-import org.apache.shardingsphere.mode.node.tuple.RepositoryTupleSwapperEngine;
+import
org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
import
org.apache.shardingsphere.mode.node.tuple.annotation.RepositoryTupleEntity;
import org.junit.jupiter.api.Test;
@@ -47,17 +47,17 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Slf4j
-public abstract class RepositoryTupleSwapperEngineIT {
+public abstract class YamlRepositoryTupleSwapperEngineIT {
private final File yamlFile;
- private final RepositoryTupleSwapperEngine engine;
+ private final YamlRepositoryTupleSwapperEngine engine;
- protected RepositoryTupleSwapperEngineIT(final String yamlFileName) {
+ protected YamlRepositoryTupleSwapperEngineIT(final String yamlFileName) {
URL url =
Thread.currentThread().getContextClassLoader().getResource(yamlFileName);
assertNotNull(url);
yamlFile = new File(url.getFile());
- engine = new RepositoryTupleSwapperEngine();
+ engine = new YamlRepositoryTupleSwapperEngine();
}
@Test
