diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProvider.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProvider.java index 9328ef7e6e79a..b9003baf4c07a 100644 --- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProvider.java +++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Collections; diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java index 682690ebf5f0b..ca5a5586b577f 100644 --- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java +++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.broadcast.constant.BroadcastOrder; import org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodePathProvider; import org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapper; diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java index 0527a8c0f02a3..91d4b268db01e 100644 --- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java +++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProvider.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProvider.java index 15c957e0387ea..6945ad4c6f947 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProvider.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProvider.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProvider.java index 377df7ca2203c..adcdcb119c870 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProvider.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java index ff1a6d0e584d6..c11748462aba5 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.encrypt.yaml.config.rule.YamlCompatibleEncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.yaml.swapper.rule.YamlCompatibleEncryptTableRuleConfigurationSwapper; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java index ec4303a908a13..85c385b8a24d8 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.yaml.swapper.rule.YamlEncryptTableRuleConfigurationSwapper; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java index 5be1b8487e8b1..37d438da4b333 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/CompatibleEncryptRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java index df97fb93a8c53..a8cb4602db034 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProvider.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProvider.java index e2d86872dd9b6..d139b1c7c2195 100644 --- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProvider.java +++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java index 61924abcd15ba..c6e4a08959e6c 100644 --- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java +++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.yaml.swapper; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java index ef1a3da263db9..2aaf1ef5c9e5e 100644 --- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java +++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProvider.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProvider.java index a3a42f15bbc9d..4b1e4c26905ed 100644 --- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProvider.java +++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.readwritesplitting.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java index 1df7abde106f1..d80cd95e947bd 100644 --- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java +++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java index 1f4a35bfebeae..b1ea6138d8909 100644 --- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java +++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/nodepath/ReadwriteSplittingRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.readwritesplitting.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProvider.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProvider.java index 6d0f7a4e0ce35..4159921168ef1 100644 --- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProvider.java +++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java index fc668fd780524..647762d6746a2 100644 --- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java +++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java index be1c6cfd7bd85..169ee36fa84c7 100644 --- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java +++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/metadata/nodepath/ShadowRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProvider.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProvider.java index 8c3e97bf7a2de..999e063dc8322 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProvider.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Arrays; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java index 8d3c07cf435a0..513fb746f4ef2 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.yaml.swapper; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java index da7a36812e803..f4c95a9d6b9c3 100644 --- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java +++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/nodepath/ShardingRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.hamcrest.collection.IsIterableContainingInAnyOrder; import org.junit.jupiter.api.Test; diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProvider.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProvider.java index 2c2b50fd86c4f..241158ccd3098 100644 --- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProvider.java +++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import java.util.Collections; diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java index 803bd764fefa5..28fde6515a4f7 100644 --- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java +++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.yaml.config.swapper; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode; import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapper; diff --git a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java index fd02d55095e36..ffa65259622e7 100644 --- a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java +++ b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/nodepath/SingleRuleNodePathProviderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.metadata.nodepath; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.mode.spi.RuleNodePathProvider; import org.junit.jupiter.api.Test; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePath.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/RuleNodePath.java similarity index 90% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePath.java rename to mode/api/src/main/java/org/apache/shardingsphere/mode/path/RuleNodePath.java index 2a9cea789612a..c2aa4c8bb14e2 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePath.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/RuleNodePath.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath; +package org.apache.shardingsphere.mode.path; import lombok.Getter; -import org.apache.shardingsphere.infra.metadata.nodepath.item.NamedRuleItemNodePath; -import org.apache.shardingsphere.infra.metadata.nodepath.item.UniqueRuleItemNodePath; -import org.apache.shardingsphere.infra.metadata.nodepath.root.RuleRootNodePath; +import org.apache.shardingsphere.mode.path.item.NamedRuleItemNodePath; +import org.apache.shardingsphere.mode.path.item.UniqueRuleItemNodePath; +import org.apache.shardingsphere.mode.path.root.RuleRootNodePath; import java.util.Collection; import java.util.HashMap; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePath.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePath.java similarity index 94% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePath.java rename to mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePath.java index 5ab63c1e09cfa..3f97a852ea3c3 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePath.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePath.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.item; +package org.apache.shardingsphere.mode.path.item; -import org.apache.shardingsphere.infra.metadata.nodepath.root.RuleRootNodePath; +import org.apache.shardingsphere.mode.path.root.RuleRootNodePath; import java.util.Optional; import java.util.regex.Matcher; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePath.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePath.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePath.java rename to mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePath.java index 2f7a44c5d062b..81a74968bd840 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePath.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePath.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.item; +package org.apache.shardingsphere.mode.path.item; -import org.apache.shardingsphere.infra.metadata.nodepath.root.RuleRootNodePath; +import org.apache.shardingsphere.mode.path.root.RuleRootNodePath; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePath.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePath.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePath.java rename to mode/api/src/main/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePath.java index 7faa998c7f10d..6fab9972ceef6 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePath.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.root; +package org.apache.shardingsphere.mode.path.root; import lombok.Getter; diff --git a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RuleNodePathProvider.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RuleNodePathProvider.java index b703ce0d46529..c562600974925 100644 --- a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RuleNodePathProvider.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RuleNodePathProvider.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mode.spi; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; /** diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePathTest.java b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/RuleNodePathTest.java similarity index 91% rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePathTest.java rename to mode/api/src/test/java/org/apache/shardingsphere/mode/path/RuleNodePathTest.java index 6017f378f5f9e..f53a3bb52b2b0 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/RuleNodePathTest.java +++ b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/RuleNodePathTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath; +package org.apache.shardingsphere.mode.path; -import org.apache.shardingsphere.infra.metadata.nodepath.item.NamedRuleItemNodePath; -import org.apache.shardingsphere.infra.metadata.nodepath.item.UniqueRuleItemNodePath; +import org.apache.shardingsphere.mode.path.item.NamedRuleItemNodePath; +import org.apache.shardingsphere.mode.path.item.UniqueRuleItemNodePath; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePathTest.java b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePathTest.java similarity index 93% rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePathTest.java rename to mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePathTest.java index ce95cb2db01ed..863f9e5294455 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/NamedRuleItemNodePathTest.java +++ b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/NamedRuleItemNodePathTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.item; +package org.apache.shardingsphere.mode.path.item; -import org.apache.shardingsphere.infra.metadata.nodepath.root.RuleRootNodePath; +import org.apache.shardingsphere.mode.path.root.RuleRootNodePath; import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePathTest.java b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePathTest.java similarity index 95% rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePathTest.java rename to mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePathTest.java index 7599ee31aea05..8ee7ecaf2f059 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/item/UniqueRuleItemNodePathTest.java +++ b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/item/UniqueRuleItemNodePathTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.item; +package org.apache.shardingsphere.mode.path.item; -import org.apache.shardingsphere.infra.metadata.nodepath.root.RuleRootNodePath; +import org.apache.shardingsphere.mode.path.root.RuleRootNodePath; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePathTest.java b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePathTest.java similarity index 96% rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePathTest.java rename to mode/api/src/test/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePathTest.java index 7f82f6a4b9fb5..fe37a2a6481eb 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/nodepath/root/RuleRootNodePathTest.java +++ b/mode/api/src/test/java/org/apache/shardingsphere/mode/path/root/RuleRootNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.metadata.nodepath.root; +package org.apache.shardingsphere.mode.path.root; import org.junit.jupiter.api.Test; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/RuleConfigurationEventBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/RuleConfigurationEventBuilder.java index 1d250b3a6c284..474d8f9cf025f 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/RuleConfigurationEventBuilder.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/RuleConfigurationEventBuilder.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher; import com.google.common.base.Strings; -import org.apache.shardingsphere.infra.metadata.nodepath.RuleNodePath; -import org.apache.shardingsphere.infra.metadata.nodepath.item.NamedRuleItemNodePath; -import org.apache.shardingsphere.infra.metadata.nodepath.item.UniqueRuleItemNodePath; +import org.apache.shardingsphere.mode.path.RuleNodePath; +import org.apache.shardingsphere.mode.path.item.NamedRuleItemNodePath; +import org.apache.shardingsphere.mode.path.item.UniqueRuleItemNodePath; import org.apache.shardingsphere.infra.rule.event.GovernanceEvent; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent;