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 cb9b6a756c5 Move related test cases into sharding.yaml.swapper package
(#19883)
cb9b6a756c5 is described below
commit cb9b6a756c517127d7fa1b5af20273ebe3f722c4
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Aug 4 23:48:48 2022 +0800
Move related test cases into sharding.yaml.swapper package (#19883)
* Move related test cases into sharding.yaml.swapper package
* Remove Redundant Import
---
.../ShardingRuleConfigurationConverterTest.java | 3 +-
...ationsForYamlShardingRuleConfigurationTest.java | 6 ++--
.../YamlShardingRuleConfigurationSwapperTest.java | 5 ++-
...rdingAutoTableRuleConfigurationSwapperTest.java | 42 ++++------------------
...ShardingTableRuleConfigurationSwapperTest.java} | 17 +++++----
...eyGenerateStrategyConfigurationSwapperTest.java | 3 +-
...rdingAuditStrategyConfigurationSwapperTest.java | 3 +-
...mlShardingStrategyConfigurationSwapperTest.java | 3 +-
8 files changed, 24 insertions(+), 58 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/ShardingRuleConfigurationConverterTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationConverterTest.java
similarity index 90%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/ShardingRuleConfigurationConverterTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationConverterTest.java
index 3e85cc59653..0f9f8fbe561 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/ShardingRuleConfigurationConverterTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationConverterTest.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper;
+package org.apache.shardingsphere.sharding.yaml.swapper;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.ShardingRuleConfigurationConverter;
import org.junit.Test;
import java.util.Collections;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
similarity index 99%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
index e881504de2f..2ab0122abd0 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper;
+package org.apache.shardingsphere.sharding.yaml.swapper;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
+import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
+import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.junit.Test;
import java.io.BufferedReader;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlShardingRuleConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleConfigurationSwapperTest.java
similarity index 98%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlShardingRuleConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleConfigurationSwapperTest.java
index 29543371b9e..5302cb30066 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/YamlShardingRuleConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleConfigurationSwapperTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper;
+package org.apache.shardingsphere.sharding.yaml.swapper;
-import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
+import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration;
@@ -29,7 +29,6 @@ import
org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfigur
import
org.apache.shardingsphere.sharding.yaml.config.strategy.audit.YamlShardingAuditStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.YamlShardingRuleConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingTableRuleConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlKeyGenerateStrategyConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingAuditStrategyConfigurationSwapper;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
similarity index 63%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
index b7ff9afb282..0c411623232 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
@@ -15,27 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper.rule;
+package org.apache.shardingsphere.sharding.yaml.swapper.rule;
-import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
import
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
import
org.apache.shardingsphere.sharding.yaml.config.rule.YamlShardingAutoTableRuleConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingAutoTableRuleConfigurationSwapper;
-import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlKeyGenerateStrategyConfigurationSwapper;
-import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingStrategyConfigurationSwapper;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import java.lang.reflect.Field;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
@@ -45,37 +34,20 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
public final class YamlShardingAutoTableRuleConfigurationSwapperTest {
- private YamlShardingAutoTableRuleConfigurationSwapper tableSwapper;
-
- @Mock
- private YamlShardingStrategyConfigurationSwapper shardingStrategySwapper;
-
- @Mock
- private YamlKeyGenerateStrategyConfigurationSwapper
keyGenerateStrategySwapper;
+ private YamlShardingAutoTableRuleConfigurationSwapper swapper;
@Before
- public void setUp() throws ReflectiveOperationException {
+ public void setUp() {
ShardingAutoTableAlgorithm shardingAlgorithm =
mock(ShardingAutoTableAlgorithm.class);
when(shardingAlgorithm.getAutoTablesAmount()).thenReturn(2);
- tableSwapper = new
YamlShardingAutoTableRuleConfigurationSwapper(Collections.singletonMap("foo_algorithm",
shardingAlgorithm), Collections.emptyMap());
- setSwapper("shardingStrategySwapper", shardingStrategySwapper);
-
when(shardingStrategySwapper.swapToYamlConfiguration(ArgumentMatchers.any())).thenReturn(mock(YamlShardingStrategyConfiguration.class));
- setSwapper("keyGenerateStrategySwapper", keyGenerateStrategySwapper);
-
when(keyGenerateStrategySwapper.swapToYamlConfiguration(ArgumentMatchers.any())).thenReturn(mock(YamlKeyGenerateStrategyConfiguration.class));
- }
-
- private void setSwapper(final String swapperFieldName, final
YamlConfigurationSwapper<?, ?> swapperFieldValue) throws
ReflectiveOperationException {
- Field field =
YamlShardingAutoTableRuleConfigurationSwapper.class.getDeclaredField(swapperFieldName);
- field.setAccessible(true);
- field.set(tableSwapper, swapperFieldValue);
+ swapper = new
YamlShardingAutoTableRuleConfigurationSwapper(Collections.singletonMap("foo_algorithm",
shardingAlgorithm), Collections.emptyMap());
}
@Test
public void assertSwapToYamlWithMinProperties() {
- YamlShardingAutoTableRuleConfiguration actual =
tableSwapper.swapToYamlConfiguration(new
ShardingAutoTableRuleConfiguration("tbl", "ds0,ds1"));
+ YamlShardingAutoTableRuleConfiguration actual =
swapper.swapToYamlConfiguration(new ShardingAutoTableRuleConfiguration("tbl",
"ds0,ds1"));
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataSources(), is("ds0,ds1"));
assertNull(actual.getShardingStrategy());
@@ -89,7 +61,7 @@ public final class
YamlShardingAutoTableRuleConfigurationSwapperTest {
shardingTableRuleConfig.setShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
shardingTableRuleConfig.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
shardingTableRuleConfig.setActualDataNodes("ds0.tbl_0");
- YamlShardingAutoTableRuleConfiguration actual =
tableSwapper.swapToYamlConfiguration(shardingTableRuleConfig);
+ YamlShardingAutoTableRuleConfiguration actual =
swapper.swapToYamlConfiguration(shardingTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataSources(), is("ds0,ds1"));
assertThat(actual.getActualTablePrefix(), is("tmp_"));
@@ -106,7 +78,7 @@ public final class
YamlShardingAutoTableRuleConfigurationSwapperTest {
when(strategyConfiguration.getShardingAlgorithmName()).thenReturn("foo_algorithm");
shardingTableRuleConfig.setShardingStrategy(strategyConfiguration);
shardingTableRuleConfig.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
- YamlShardingAutoTableRuleConfiguration actual =
tableSwapper.swapToYamlConfiguration(shardingTableRuleConfig);
+ YamlShardingAutoTableRuleConfiguration actual =
swapper.swapToYamlConfiguration(shardingTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataSources(), is("ds0,ds1"));
assertThat(actual.getActualTablePrefix(), is("tmp_"));
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlTableRuleConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingTableRuleConfigurationSwapperTest.java
similarity index 89%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlTableRuleConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingTableRuleConfigurationSwapperTest.java
index 609ed92d1bd..771dc46b91f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/rule/YamlTableRuleConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingTableRuleConfigurationSwapperTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper.rule;
+package org.apache.shardingsphere.sharding.yaml.swapper.rule;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfigur
import
org.apache.shardingsphere.sharding.yaml.config.strategy.audit.YamlShardingAuditStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingTableRuleConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlKeyGenerateStrategyConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingStrategyConfigurationSwapper;
import org.junit.Before;
@@ -47,9 +46,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class YamlTableRuleConfigurationSwapperTest {
+public final class YamlShardingTableRuleConfigurationSwapperTest {
- private final YamlShardingTableRuleConfigurationSwapper tableSwapper = new
YamlShardingTableRuleConfigurationSwapper();
+ private final YamlShardingTableRuleConfigurationSwapper swapper = new
YamlShardingTableRuleConfigurationSwapper();
@Mock
private YamlShardingStrategyConfigurationSwapper shardingStrategySwapper;
@@ -70,12 +69,12 @@ public final class YamlTableRuleConfigurationSwapperTest {
private void setSwapper(final String swapperFieldName, final
YamlConfigurationSwapper swapperFieldValue) throws ReflectiveOperationException
{
Field field =
YamlShardingTableRuleConfigurationSwapper.class.getDeclaredField(swapperFieldName);
field.setAccessible(true);
- field.set(tableSwapper, swapperFieldValue);
+ field.set(swapper, swapperFieldValue);
}
@Test
public void assertSwapToYamlWithMinProperties() {
- YamlTableRuleConfiguration actual =
tableSwapper.swapToYamlConfiguration(new ShardingTableRuleConfiguration("tbl",
"ds_$->{0..1}.tbl_$->{0..1}"));
+ YamlTableRuleConfiguration actual =
swapper.swapToYamlConfiguration(new ShardingTableRuleConfiguration("tbl",
"ds_$->{0..1}.tbl_$->{0..1}"));
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(),
is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNull(actual.getDatabaseStrategy());
@@ -91,7 +90,7 @@ public final class YamlTableRuleConfigurationSwapperTest {
shardingTableRuleConfig.setTableShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
shardingTableRuleConfig.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
shardingTableRuleConfig.setAuditStrategy(mock(ShardingAuditStrategyConfiguration.class));
- YamlTableRuleConfiguration actual =
tableSwapper.swapToYamlConfiguration(shardingTableRuleConfig);
+ YamlTableRuleConfiguration actual =
swapper.swapToYamlConfiguration(shardingTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(),
is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNotNull(actual.getDatabaseStrategy());
@@ -110,7 +109,7 @@ public final class YamlTableRuleConfigurationSwapperTest {
YamlTableRuleConfiguration yamlConfig = new
YamlTableRuleConfiguration();
yamlConfig.setLogicTable("tbl");
yamlConfig.setActualDataNodes("ds_$->{0..1}.tbl_$->{0..1}");
- ShardingTableRuleConfiguration actual =
tableSwapper.swapToObject(yamlConfig);
+ ShardingTableRuleConfiguration actual =
swapper.swapToObject(yamlConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(),
is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNull(actual.getDatabaseShardingStrategy());
@@ -127,7 +126,7 @@ public final class YamlTableRuleConfigurationSwapperTest {
yamlConfig.setTableStrategy(mock(YamlShardingStrategyConfiguration.class));
yamlConfig.setKeyGenerateStrategy(mock(YamlKeyGenerateStrategyConfiguration.class));
yamlConfig.setAuditStrategy(mock(YamlShardingAuditStrategyConfiguration.class));
- ShardingTableRuleConfiguration actual =
tableSwapper.swapToObject(yamlConfig);
+ ShardingTableRuleConfiguration actual =
swapper.swapToObject(yamlConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(),
is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNotNull(actual.getDatabaseShardingStrategy());
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
similarity index 92%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
index 9048fd1c3ca..342638cc325 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlKeyGenerateStrategyConfigurationSwapperTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper.strategy;
+package org.apache.shardingsphere.sharding.yaml.swapper.strategy;
import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlKeyGenerateStrategyConfigurationSwapper;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
similarity index 94%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
index 7561659580e..65cc82c41e4 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingAuditStrategyConfigurationSwapperTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper.strategy;
+package org.apache.shardingsphere.sharding.yaml.swapper.strategy;
import
org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.audit.YamlShardingAuditStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingAuditStrategyConfigurationSwapper;
import org.junit.Test;
import java.util.Arrays;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
similarity index 98%
rename from
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
rename to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
index f4a1a621a1d..ec2ac616443 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/YamlShardingStrategyConfigurationSwapperTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.swapper.strategy;
+package org.apache.shardingsphere.sharding.yaml.swapper.strategy;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.ComplexShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.HintShardingStrategyConfiguration;
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlHint
import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlNoneShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlStandardShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingStrategyConfigurationSwapper;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
