This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 59483380697 Refactor RepositoryTupleSwapperEngineIT (#31123)
59483380697 is described below
commit 59483380697be1963e335f2d4a5c4c4d746f70c7
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 5 23:30:06 2024 +0800
Refactor RepositoryTupleSwapperEngineIT (#31123)
* Refactor RepositoryTupleSwapperIT
* Refactor RepositoryTupleSwapperIT
* Refactor RepositoryTupleSwapperEngineIT
---
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...nfigurationRepositoryTupleSwapperEngineIT.java} | 9 +++----
...IT.java => RepositoryTupleSwapperEngineIT.java} | 29 ++++++++--------------
16 files changed, 71 insertions(+), 93 deletions(-)
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperIT.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 83%
rename from
features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperIT.java
rename to
features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 2ced5dde341..269740a8aee 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/it/BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -18,20 +18,19 @@
package org.apache.shardingsphere.broadcast.it;
import
org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration;
-import
org.apache.shardingsphere.broadcast.yaml.swapper.BroadcastRuleConfigurationRepositoryTupleSwapper;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class BroadcastRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- BroadcastRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/broadcast-rule.yaml", new
BroadcastRuleConfigurationRepositoryTupleSwapper(), false);
+ BroadcastRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/broadcast-rule.yaml");
}
@Override
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperIT.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 85%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperIT.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
index ef1d3d9b79a..aa652d8b1d9 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperIT.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/it/EncryptConfigurationRepositoryTupleSwapperEngineIT.java
@@ -18,20 +18,19 @@
package org.apache.shardingsphere.encrypt.it;
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
-import
org.apache.shardingsphere.encrypt.yaml.swapper.EncryptRuleConfigurationRepositoryTupleSwapper;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class EncryptConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class EncryptConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- EncryptConfigurationRepositoryTupleSwapperIT() {
- super("yaml/encrypt-rule.yaml", new
EncryptRuleConfigurationRepositoryTupleSwapper(), false);
+ EncryptConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/encrypt-rule.yaml");
}
@Override
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperIT.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 86%
rename from
features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperIT.java
rename to
features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperEngineIT.java
index c5368da778a..e076349740f 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperIT.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/it/MaskConfigurationRepositoryTupleSwapperEngineIT.java
@@ -20,18 +20,17 @@ package org.apache.shardingsphere.mask.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.mask.yaml.config.YamlMaskRuleConfiguration;
-import
org.apache.shardingsphere.mask.yaml.swapper.MaskRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class MaskConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class MaskConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- MaskConfigurationRepositoryTupleSwapperIT() {
- super("yaml/mask-rule.yaml", new
MaskRuleConfigurationRepositoryTupleSwapper(), false);
+ MaskConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/mask-rule.yaml");
}
@Override
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperIT.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 84%
rename from
features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperIT.java
rename to
features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
index b23d98471d4..18f5ac07b6d 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperIT.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
@@ -20,18 +20,17 @@ package org.apache.shardingsphere.readwritesplitting.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.yaml.swapper.ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ReadwriteSplittingConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- ReadwriteSplittingConfigurationRepositoryTupleSwapperIT() {
- super("yaml/readwrite-splitting-rule.yaml", new
ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper(), false);
+ ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/readwrite-splitting-rule.yaml");
}
@Override
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperIT.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 90%
rename from
features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperIT.java
rename to
features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 89854f8cb6c..f19a494eae6 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -20,8 +20,7 @@ package org.apache.shardingsphere.shadow.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration;
-import
org.apache.shardingsphere.shadow.yaml.swapper.ShadowRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.ArrayList;
import java.util.List;
@@ -29,10 +28,10 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ShadowRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class ShadowRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- ShadowRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/shadow-rule.yaml", new
ShadowRuleConfigurationRepositoryTupleSwapper(), false);
+ ShadowRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/shadow-rule.yaml");
}
@Override
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperIT.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperIT.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
index c3fcaf476f7..70de0e39451 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperIT.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/it/ShardingConfigurationRepositoryTupleSwapperEngineIT.java
@@ -20,8 +20,7 @@ package org.apache.shardingsphere.sharding.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.ShardingRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.ArrayList;
import java.util.List;
@@ -29,10 +28,10 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ShardingConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class ShardingConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- ShardingConfigurationRepositoryTupleSwapperIT() {
- super("yaml/sharding-rule.yaml", new
ShardingRuleConfigurationRepositoryTupleSwapper(), false);
+ ShardingConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/sharding-rule.yaml");
}
@Override
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 80%
rename from
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
index d301f24e081..7b59e69cb57 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/it/AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -17,20 +17,19 @@
package org.apache.shardingsphere.authority.it;
-import
org.apache.shardingsphere.authority.yaml.swapper.AuthorityRuleConfigurationRepositoryTupleSwapper;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class AuthorityRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- AuthorityRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/authority-rule.yaml", new
AuthorityRuleConfigurationRepositoryTupleSwapper(), true);
+ AuthorityRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/authority-rule.yaml");
}
@Override
diff --git
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 80%
rename from
kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 14ef2bcafd7..d271281b321 100644
---
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/it/GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -17,20 +17,19 @@
package org.apache.shardingsphere.globalclock.it;
-import
org.apache.shardingsphere.globalclock.yaml.swapper.GlobalClockRuleConfigurationRepositoryTupleSwapper;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class GlobalClockRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- GlobalClockRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/global-clock-rule.yaml", new
GlobalClockRuleConfigurationRepositoryTupleSwapper(), true);
+ GlobalClockRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/global-clock-rule.yaml");
}
@Override
diff --git
a/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 81%
rename from
kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 256036c74b9..277b7f70f42 100644
---
a/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/logging/core/src/test/java/org/apache/shardingsphere/logging/it/LoggingRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.logging.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.logging.yaml.swapper.LoggingRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class LoggingRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class LoggingRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- LoggingRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/logging-rule.yaml", new
LoggingRuleConfigurationRepositoryTupleSwapper(), true);
+ LoggingRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/logging-rule.yaml");
}
@Override
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 81%
rename from
kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
index dcf6bebee5e..c305dfb41f1 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/it/SingleRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.single.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.single.yaml.config.swapper.SingleRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SingleRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class SingleRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- SingleRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/single-rule.yaml", new
SingleRuleConfigurationRepositoryTupleSwapper(), false);
+ SingleRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/single-rule.yaml");
}
@Override
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 79%
rename from
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 4e93d662610..717dc3b4682 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/it/SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.sqlfederation.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.sqlfederation.yaml.swapper.SQLFederationRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLFederationRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- SQLFederationRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/sql-federation-rule.yaml", new
SQLFederationRuleConfigurationRepositoryTupleSwapper(), true);
+ SQLFederationRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/sql-federation-rule.yaml");
}
@Override
diff --git
a/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 80%
rename from
kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 9a007cf9a38..acc7afb454d 100644
---
a/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/sql-parser/core/src/test/java/org/apache/shardingsphere/parser/it/SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.parser.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.parser.yaml.swapper.SQLParserRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLParserRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- SQLParserRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/sql-parser-rule.yaml", new
SQLParserRuleConfigurationRepositoryTupleSwapper(), true);
+ SQLParserRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/sql-parser-rule.yaml");
}
@Override
diff --git
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 79%
rename from
kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
index c7859fd62cd..d1502a64009 100644
---
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/it/SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.sqltranslator.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.sqltranslator.yaml.swapper.SQLTranslatorRuleConfigurationRepositoryTupleSwapper;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SQLTranslatorRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- SQLTranslatorRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/sql-translator-rule.yaml", new
SQLTranslatorRuleConfigurationRepositoryTupleSwapper(), true);
+ SQLTranslatorRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/sql-translator-rule.yaml");
}
@Override
diff --git
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 81%
rename from
kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperEngineIT.java
index e5c37d001eb..ef2847891b4 100644
---
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/it/TrafficRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.traffic.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
-import
org.apache.shardingsphere.traffic.yaml.swapper.TrafficRuleConfigurationRepositoryTupleSwapper;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class TrafficRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class TrafficRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- TrafficRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/traffic-rule.yaml", new
TrafficRuleConfigurationRepositoryTupleSwapper(), true);
+ TrafficRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/traffic-rule.yaml");
}
@Override
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperIT.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
similarity index 80%
rename from
kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperIT.java
rename to
kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 410146ad9a6..1950f942e7e 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperIT.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/it/TransactionRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.transaction.it;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperIT;
-import
org.apache.shardingsphere.transaction.yaml.swapper.TransactionRuleConfigurationRepositoryTupleSwapper;
+import org.apache.shardingsphere.test.it.yaml.RepositoryTupleSwapperEngineIT;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class TransactionRuleConfigurationRepositoryTupleSwapperIT extends
RepositoryTupleSwapperIT {
+class TransactionRuleConfigurationRepositoryTupleSwapperEngineIT extends
RepositoryTupleSwapperEngineIT {
- TransactionRuleConfigurationRepositoryTupleSwapperIT() {
- super("yaml/transaction-rule.yaml", new
TransactionRuleConfigurationRepositoryTupleSwapper(), true);
+ TransactionRuleConfigurationRepositoryTupleSwapperEngineIT() {
+ super("yaml/transaction-rule.yaml");
}
@Override
diff --git
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperIT.java
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
similarity index 77%
rename from
test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperIT.java
rename to
test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
index a97554b4d39..2b8853a9445 100644
---
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperIT.java
+++
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/RepositoryTupleSwapperEngineIT.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.test.it.yaml;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.util.yaml.datanode.RepositoryTuple;
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.infra.yaml.config.pojo.rule.annotation.RepositoryTupleEntity;
import org.apache.shardingsphere.mode.engine.RepositoryTupleSwapperEngine;
-import org.apache.shardingsphere.mode.spi.RepositoryTupleSwapper;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -44,28 +44,23 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public abstract class RepositoryTupleSwapperIT {
+public abstract class RepositoryTupleSwapperEngineIT {
private final File yamlFile;
- @SuppressWarnings("rawtypes")
- private final RepositoryTupleSwapper swapper;
+ private final RepositoryTupleSwapperEngine engine;
- private final boolean isGlobalRule;
-
- @SuppressWarnings("rawtypes")
- public RepositoryTupleSwapperIT(final String yamlFileName, final
RepositoryTupleSwapper swapper, final boolean isGlobalRule) {
+ public RepositoryTupleSwapperEngineIT(final String yamlFileName) {
URL url =
Thread.currentThread().getContextClassLoader().getResource(yamlFileName);
assertNotNull(url);
yamlFile = new File(url.getFile());
- this.swapper = swapper;
- this.isGlobalRule = isGlobalRule;
+ engine = new RepositoryTupleSwapperEngine();
}
@Test
void assertSwapToRepositoryTuples() throws IOException {
YamlRuleConfiguration yamlRuleConfig = loadYamlRuleConfiguration();
- assertRepositoryTuples(new ArrayList<>(new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(yamlRuleConfig)),
yamlRuleConfig);
+ assertRepositoryTuples(new
ArrayList<>(engine.swapToRepositoryTuples(yamlRuleConfig)), yamlRuleConfig);
}
private YamlRuleConfiguration loadYamlRuleConfiguration() throws
IOException {
@@ -90,21 +85,19 @@ public abstract class RepositoryTupleSwapperIT {
assertThat(getActualYamlContent(), is(getExpectedYamlContent()));
}
- @SuppressWarnings("unchecked")
private String getActualYamlContent() throws IOException {
YamlRuleConfiguration yamlRuleConfig = loadYamlRuleConfiguration();
- Collection<RepositoryTuple> repositoryTuples = new
RepositoryTupleSwapperEngine().swapToRepositoryTuples(yamlRuleConfig).stream()
- .map(each -> new
RepositoryTuple(getRepositoryTupleKey(Objects.requireNonNull(yamlRuleConfig.getClass().getAnnotation(RepositoryTupleEntity.class)).value(),
each), each.getValue()))
- .collect(Collectors.toList());
- RepositoryTupleSwapperEngine repositoryTupleSwapperEngine = new
RepositoryTupleSwapperEngine();
- Optional<YamlRuleConfiguration> actualYamlRuleConfig =
repositoryTupleSwapperEngine.swapToObject(repositoryTuples,
swapper.getTypeClass());
+ String ruleTypeName =
Objects.requireNonNull(yamlRuleConfig.getClass().getAnnotation(RepositoryTupleEntity.class)).value();
+ Collection<RepositoryTuple> repositoryTuples =
engine.swapToRepositoryTuples(yamlRuleConfig).stream()
+ .map(each -> new
RepositoryTuple(getRepositoryTupleKey(yamlRuleConfig instanceof
YamlGlobalRuleConfiguration, ruleTypeName, each),
each.getValue())).collect(Collectors.toList());
+ Optional<YamlRuleConfiguration> actualYamlRuleConfig =
engine.swapToObject(repositoryTuples, yamlRuleConfig.getClass());
assertTrue(actualYamlRuleConfig.isPresent());
YamlRootConfiguration yamlRootConfig = new YamlRootConfiguration();
yamlRootConfig.setRules(Collections.singletonList(actualYamlRuleConfig.get()));
return YamlEngine.marshal(yamlRootConfig);
}
- private String getRepositoryTupleKey(final String ruleTypeName, final
RepositoryTuple tuple) {
+ private String getRepositoryTupleKey(final boolean isGlobalRule, final
String ruleTypeName, final RepositoryTuple tuple) {
return isGlobalRule
? String.format("/metadata/rules/%s/versions/0", ruleTypeName)
: String.format("/metadata/foo_db/rules/%s/%s/versions/0",
ruleTypeName, tuple.getKey());
