unify package name of sharding-core-api/sharding-core-common (#5562)

* unify package name of encrypt-core-api

* unify package name of sharding-core-api

* unify package name of sharding-core-common

encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/EncryptColumnRuleConfiguration.java → encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/config/EncryptColumnRuleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.api;
+package org.apache.shardingsphere.encrypt.api.config;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/EncryptRuleConfiguration.java → encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/config/EncryptRuleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.api;
+package org.apache.shardingsphere.encrypt.api.config;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/EncryptTableRuleConfiguration.java → encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/config/EncryptTableRuleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.api;
+package org.apache.shardingsphere.encrypt.api.config;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/EncryptorRuleConfiguration.java → encrypt-core/encrypt-core-api/src/main/java/org/apache/shardingsphere/encrypt/api/config/EncryptorRuleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.api;
+package org.apache.shardingsphere.encrypt.api.config;
 
 import lombok.Getter;
 import org.apache.shardingsphere.underlying.common.config.TypedSPIConfiguration;

encrypt-core/encrypt-core-api/src/test/java/org/apache/shardingsphere/encrypt/api/EncryptorRuleConfigurationTest.java → encrypt-core/encrypt-core-api/src/test/java/org/apache/shardingsphere/encrypt/api/config/EncryptorRuleConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.api;
+package org.apache.shardingsphere.encrypt.api.config;
 
 import org.junit.Test;
 

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java

@@ -19,15 +19,15 @@ package org.apache.shardingsphere.encrypt.rule;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
 import org.apache.shardingsphere.encrypt.strategy.EncryptTable;
 import org.apache.shardingsphere.encrypt.strategy.spi.Encryptor;
 import org.apache.shardingsphere.encrypt.strategy.spi.QueryAssistedEncryptor;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 
 import java.util.Collection;

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleBuilder.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.rule;
 
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRuleBuilder;
 
 import java.util.Collection;

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/strategy/EncryptTable.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.encrypt.strategy;
 
 import com.google.common.collect.Maps;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.exception.ShardingSphereException;
 
 import java.util.Collection;

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/strategy/spi/Encryptor.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.strategy.spi;
 
-import org.apache.shardingsphere.spi.type.TypedSPI;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
 
 /**
  * Encryptor.

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptColumnRuleConfigurationYamlSwapper.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.yaml.swapper;
 
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
 import org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptColumnRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;
 

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.encrypt.yaml.swapper;
 
 import com.google.common.collect.Maps;
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
 import org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;
 

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptTableRuleConfigurationYamlSwapper.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.encrypt.yaml.swapper;
 
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptColumnRuleConfiguration;
 import org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptTableRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;

encrypt-core/encrypt-core-common/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptorRuleConfigurationYamlSwapper.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.yaml.swapper;
 
-import org.apache.shardingsphere.encrypt.api.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
 import org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptorRuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;
 

encrypt-core/encrypt-core-common/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java

@@ -18,10 +18,10 @@
 package org.apache.shardingsphere.encrypt.rule;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 

encrypt-core/encrypt-core-common/src/test/java/org/apache/shardingsphere/encrypt/strategy/impl/EncryptTableTest.java

@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.encrypt.strategy.impl;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.encrypt.strategy.EncryptTable;
 import org.apache.shardingsphere.underlying.common.exception.ShardingSphereException;
 import org.junit.Before;

encrypt-core/encrypt-core-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java

@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.encrypt.rewrite.parameterized;
 
 import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.core.yaml.config.YamlRootRuleConfigurations;
-import org.apache.shardingsphere.core.yaml.swapper.root.RuleRootConfigurationsYamlSwapper;
+import org.apache.shardingsphere.sharding.core.yaml.config.YamlRootRuleConfigurations;
+import org.apache.shardingsphere.sharding.core.yaml.swapper.root.RuleRootConfigurationsYamlSwapper;
 import org.apache.shardingsphere.sql.parser.SQLParserEngine;
 import org.apache.shardingsphere.sql.parser.SQLParserEngineFactory;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;

encrypt-core/encrypt-core-rewrite/src/test/resources/logback-test.xml

@@ -26,7 +26,7 @@
         <appender-ref ref="console"/>
     </logger>
     <logger name="org.apache.shardingsphere.underlying.executor.sql.jdbc.executor.ExecutorExceptionHandler" level="off" />
-    <logger name="org.apache.shardingsphere.core.log.ConfigurationLogger" level="off" />
+    <logger name="org.apache.shardingsphere.sharding.core.log.ConfigurationLogger" level="off" />
     <logger name="ShardingSphere-metadata" level="off" />
     
     <root>

examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingDatabaseAlgorithm.java

@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.example.algorithm;
 
 import com.google.common.collect.Range;
-import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
-import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue;
-import org.apache.shardingsphere.api.sharding.standard.StandardShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;

examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingTableAlgorithm.java

@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.example.algorithm;
 
 import com.google.common.collect.Range;
-import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
-import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue;
-import org.apache.shardingsphere.api.sharding.standard.StandardShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;

examples/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/local/LocalEncryptConfiguration.java

@@ -17,10 +17,10 @@
 
 package org.apache.shardingsphere.example.orchestration.raw.jdbc.config.local;
 
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;

examples/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/local/LocalShardingDatabasesAndTablesConfiguration.java

@@ -17,19 +17,19 @@
 
 package org.apache.shardingsphere.example.orchestration.raw.jdbc.config.local;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
-import org.apache.shardingsphere.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
 import org.apache.shardingsphere.orchestration.center.config.OrchestrationConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/local/LocalShardingDatabasesConfiguration.java

@@ -17,18 +17,18 @@
 
 package org.apache.shardingsphere.example.orchestration.raw.jdbc.config.local;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
-import org.apache.shardingsphere.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
 import org.apache.shardingsphere.orchestration.center.config.OrchestrationConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/local/LocalShardingMasterSlaveConfiguration.java

@@ -17,21 +17,21 @@
 
 package org.apache.shardingsphere.example.orchestration.raw.jdbc.config.local;
 
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingDatabaseAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
 import org.apache.shardingsphere.orchestration.center.config.OrchestrationConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/local/LocalShardingTablesConfiguration.java

@@ -17,18 +17,18 @@
 
 package org.apache.shardingsphere.example.orchestration.raw.jdbc.config.local;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
 import org.apache.shardingsphere.orchestration.center.config.OrchestrationConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/config/EncryptDatabasesConfiguration.java

@@ -17,10 +17,10 @@
 
 package org.apache.shardingsphere.example.encrypt.table.raw.jdbc.config;
 
-import org.apache.shardingsphere.encrypt.api.EncryptColumnRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptTableRuleConfiguration;
-import org.apache.shardingsphere.encrypt.api.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptColumnRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;

examples/sharding-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ExampleMain.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.example.hint.raw.jdbc;
 
-import org.apache.shardingsphere.api.hint.HintManager;
+import org.apache.shardingsphere.sharding.api.hint.HintManager;
 import org.apache.shardingsphere.example.core.api.service.ExampleService;
 import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
 import org.apache.shardingsphere.shardingjdbc.api.yaml.YamlShardingSphereDataSourceFactory;

examples/sharding-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ModuloHintShardingAlgorithm.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.example.hint.raw.jdbc;
 
-import org.apache.shardingsphere.api.sharding.hint.HintShardingAlgorithm;
-import org.apache.shardingsphere.api.sharding.hint.HintShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
 
 import java.util.ArrayList;
 import java.util.Collection;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationPrecise.java

@@ -17,17 +17,17 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
-import org.apache.shardingsphere.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationRange.java

@@ -17,17 +17,17 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingDatabaseAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java

@@ -17,16 +17,16 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
-import org.apache.shardingsphere.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationRange.java

@@ -17,16 +17,16 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingDatabaseAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationPrecise.java

@@ -17,19 +17,19 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingDatabaseAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingMasterSlaveConfigurationRange.java

@@ -17,19 +17,19 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
-import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingDatabaseAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
+import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationPrecise.java

@@ -17,16 +17,16 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationRange.java

@@ -17,16 +17,16 @@
 
 package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
 
-import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
-import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
 import org.apache.shardingsphere.example.algorithm.StandardModuloShardingTableAlgorithm;
 import org.apache.shardingsphere.example.config.ExampleConfiguration;
 import org.apache.shardingsphere.example.core.api.DataSourceUtil;
+import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.core.strategy.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.shardingjdbc.api.ShardingSphereDataSourceFactory;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import javax.sql.DataSource;

examples/sharding-proxy-example/sharding-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ModuloHintShardingAlgorithm.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.example.proxy.hint;
 
-import org.apache.shardingsphere.api.sharding.hint.HintShardingAlgorithm;
-import org.apache.shardingsphere.api.sharding.hint.HintShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
 
 import java.util.ArrayList;
 import java.util.Collection;

master-slave-core/master-slave-core-api/src/main/java/org/apache/shardingsphere/masterslave/spi/MasterSlaveLoadBalanceAlgorithm.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.masterslave.spi;
 
-import org.apache.shardingsphere.spi.type.TypedSPI;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
 
 import java.util.List;
 

master-slave-core/master-slave-core-common/src/main/java/org/apache/shardingsphere/masterslave/core/rule/MasterSlaveDataSourceRule.java

@@ -21,9 +21,9 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import org.apache.shardingsphere.masterslave.api.config.LoadBalanceStrategyConfiguration;
 import org.apache.shardingsphere.masterslave.api.config.MasterSlaveDataSourceConfiguration;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.masterslave.spi.MasterSlaveLoadBalanceAlgorithm;
-import org.apache.shardingsphere.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
 
 import java.util.Collection;
 import java.util.HashMap;

master-slave-core/master-slave-core-route/src/main/java/org/apache/shardingsphere/masterslave/route/engine/impl/MasterSlaveDataSourceRouter.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.masterslave.route.engine.impl;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.api.hint.HintManager;
+import org.apache.shardingsphere.sharding.api.hint.HintManager;
 import org.apache.shardingsphere.masterslave.core.rule.MasterSlaveDataSourceRule;
 import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
 import org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement;

shadow-core/shadow-core-common/src/main/java/org/apache/shardingsphere/shadow/common/condition/ShadowConditionEngine.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.common.condition;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.type.WhereAvailable;
 import org.apache.shardingsphere.sql.parser.sql.segment.dml.expr.simple.SimpleExpressionSegment;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/aware/ShadowRuleAware.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.rewrite.aware;
 
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 
 /**
  * Shadow rule aware.

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/context/ShadowSQLRewriteContextDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.rewrite.context;
 
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.rewrite.parameter.ShadowParameterRewriterBuilder;
 import org.apache.shardingsphere.shadow.rewrite.token.ShadowTokenGenerateBuilder;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngine.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.rewrite.judgement.impl;
 
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.rewrite.judgement.ShadowJudgementEngine;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngine.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.rewrite.judgement.impl;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.common.condition.ShadowCondition;
 import org.apache.shardingsphere.shadow.common.condition.ShadowConditionEngine;
 import org.apache.shardingsphere.shadow.rewrite.judgement.ShadowJudgementEngine;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/parameter/ShadowParameterRewriter.java

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shadow.rewrite.parameter;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.shardingsphere.shadow.rewrite.aware.ShadowRuleAware;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.rewrite.parameter.rewriter.ParameterRewriter;
 

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/parameter/ShadowParameterRewriterBuilder.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.rewrite.parameter;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.rewrite.aware.ShadowRuleAware;
 import org.apache.shardingsphere.shadow.rewrite.parameter.impl.ShadowInsertValueParameterRewriter;
 import org.apache.shardingsphere.shadow.rewrite.parameter.impl.ShadowPredicateParameterRewriter;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/ShadowTokenGenerateBuilder.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.rewrite.token;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.rewrite.aware.ShadowRuleAware;
 import org.apache.shardingsphere.shadow.rewrite.token.generator.impl.RemoveShadowColumnTokenGenerator;
 import org.apache.shardingsphere.shadow.rewrite.token.generator.impl.ShadowInsertValuesTokenGenerator;

shadow-core/shadow-core-rewrite/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/BaseShadowSQLTokenGenerator.java

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shadow.rewrite.token.generator;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.shardingsphere.shadow.rewrite.aware.ShadowRuleAware;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.rewrite.sql.token.generator.SQLTokenGenerator;
 

shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/PreparedJudgementEngineTest.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.rewrite.judgement.impl;
 
 import org.apache.shardingsphere.api.config.shadow.ShadowRuleConfiguration;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;
 import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.ColumnSegment;

shadow-core/shadow-core-rewrite/src/test/java/org/apache/shardingsphere/shadow/rewrite/judgement/impl/SimpleJudgementEngineTest.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.rewrite.judgement.impl;
 
 import org.apache.shardingsphere.api.config.shadow.ShadowRuleConfiguration;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatementContext;

shadow-core/shadow-core-route/src/main/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.route.engine;
 
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.route.engine.impl.PreparedShadowDataSourceRouter;
 import org.apache.shardingsphere.shadow.route.engine.impl.SimpleShadowDataSourceRouter;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;

shadow-core/shadow-core-route/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/PreparedShadowDataSourceRouter.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.route.engine.impl;
 
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.route.engine.ShadowDataSourceRouter;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;

shadow-core/shadow-core-route/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/SimpleShadowDataSourceRouter.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.route.engine.impl;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.shadow.common.condition.ShadowCondition;
 import org.apache.shardingsphere.shadow.common.condition.ShadowConditionEngine;
 import org.apache.shardingsphere.shadow.route.engine.ShadowDataSourceRouter;

shadow-core/shadow-core-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteDecoratorTest.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.route.engine;
 
 import org.apache.shardingsphere.api.config.shadow.ShadowRuleConfiguration;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.segment.insert.values.InsertValueContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateTableStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;

shadow-core/shadow-core-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/PreparedShadowDataSourceRouterTest.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.route.engine.impl;
 
 import org.apache.shardingsphere.api.config.shadow.ShadowRuleConfiguration;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;
 import org.apache.shardingsphere.sql.parser.sql.segment.dml.column.ColumnSegment;

shadow-core/shadow-core-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/SimpleShadowDataSourceRouterTest.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.route.engine.impl;
 
 import org.apache.shardingsphere.api.config.shadow.ShadowRuleConfiguration;
-import org.apache.shardingsphere.core.rule.ShadowRule;
+import org.apache.shardingsphere.sharding.core.rule.ShadowRule;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.InsertStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatementContext;

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/DatabaseTimeServiceDelegate.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/DatabaseTimeServiceDelegate.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time;
+package org.apache.shardingsphere.sharding.route.time;
 
 import org.apache.shardingsphere.sharding.route.spi.TimeService;
-import org.apache.shardingsphere.route.time.impl.TimeServiceFactory;
+import org.apache.shardingsphere.sharding.route.time.impl.TimeServiceFactory;
 
 import java.util.Date;
 

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/TimeServiceConfiguration.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/TimeServiceConfiguration.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time;
+package org.apache.shardingsphere.sharding.route.time;
 
 import lombok.Getter;
-import org.apache.shardingsphere.route.time.exception.TimeServiceInitException;
+import org.apache.shardingsphere.sharding.route.time.exception.TimeServiceInitException;
 
 import javax.sql.DataSource;
 import java.beans.IntrospectionException;

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/exception/NoDatabaseSQLEntrySupportException.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/exception/NoDatabaseSQLEntrySupportException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.exception;
+package org.apache.shardingsphere.sharding.route.time.exception;
 
 /**
  * No database SQL entry support.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/exception/TimeServiceInitException.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/exception/TimeServiceInitException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.exception;
+package org.apache.shardingsphere.sharding.route.time.exception;
 
 /**
  * Time service init exception.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/impl/DatabaseTimeService.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/DatabaseTimeService.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.impl;
+package org.apache.shardingsphere.sharding.route.time.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.sharding.route.spi.TimeService;

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/impl/TimeServiceFactory.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/TimeServiceFactory.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.impl;
+package org.apache.shardingsphere.sharding.route.time.impl;
 
 import org.apache.shardingsphere.sharding.route.spi.TimeService;
-import org.apache.shardingsphere.route.time.TimeServiceConfiguration;
-import org.apache.shardingsphere.route.time.spi.SPIDataBaseSQLEntry;
+import org.apache.shardingsphere.sharding.route.time.TimeServiceConfiguration;
+import org.apache.shardingsphere.sharding.route.time.spi.SPIDataBaseSQLEntry;
 
 /**
  * Time service factory.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/DatabaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/DatabaseSQLEntry.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 /**
  * Database SQL entry.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/MySQLDatabaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/MySQLDatabaseSQLEntry.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 /**
  * MySQL entry.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/OracleDatabaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/OracleDatabaseSQLEntry.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 /**
  * Oracle entry.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/PostgreSQLDatabaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/PostgreSQLDatabaseSQLEntry.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 /**
  * PostgreSQL entry.

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/SPIDataBaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/SPIDataBaseSQLEntry.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.route.time.exception.NoDatabaseSQLEntrySupportException;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.sharding.route.time.exception.NoDatabaseSQLEntrySupportException;
+import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
 
 import java.util.Collection;
 

sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/route/time/spi/SQLServerDatabaseSQLEntry.java → sharding-core/database-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/spi/SQLServerDatabaseSQLEntry.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time.spi;
+package org.apache.shardingsphere.sharding.route.time.spi;
 
 /**
  * SQLServer entry.

sharding-core/database-time-service/src/main/resources/META-INF/services/org.apache.shardingsphere.sharding.route.spi.TimeService

@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.route.time.DatabaseTimeServiceDelegate
+org.apache.shardingsphere.sharding.route.time.DatabaseTimeServiceDelegate

sharding-core/database-time-service/src/main/resources/META-INF/services/org.apache.shardingsphere.route.time.spi.DatabaseSQLEntry → sharding-core/database-time-service/src/main/resources/META-INF/services/org.apache.shardingsphere.sharding.route.time.spi.DatabaseSQLEntry

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.route.time.spi.MySQLDatabaseSQLEntry
-org.apache.shardingsphere.route.time.spi.OracleDatabaseSQLEntry
-org.apache.shardingsphere.route.time.spi.PostgreSQLDatabaseSQLEntry
-org.apache.shardingsphere.route.time.spi.SQLServerDatabaseSQLEntry
+org.apache.shardingsphere.sharding.route.time.spi.MySQLDatabaseSQLEntry
+org.apache.shardingsphere.sharding.route.time.spi.OracleDatabaseSQLEntry
+org.apache.shardingsphere.sharding.route.time.spi.PostgreSQLDatabaseSQLEntry
+org.apache.shardingsphere.sharding.route.time.spi.SQLServerDatabaseSQLEntry

sharding-core/database-time-service/src/test/java/org/apache/shardingsphere/route/time/PropertiesUtils.java → sharding-core/database-time-service/src/test/java/org/apache/shardingsphere/sharding/route/time/PropertiesUtils.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time;
+package org.apache.shardingsphere.sharding.route.time;
 
 import java.io.File;
 import java.io.FileOutputStream;

sharding-core/database-time-service/src/test/java/org/apache/shardingsphere/route/time/TimeServiceConfigurationTest.java → sharding-core/database-time-service/src/test/java/org/apache/shardingsphere/sharding/route/time/TimeServiceConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.route.time;
+package org.apache.shardingsphere.sharding.route.time;
 
 import org.junit.Test;
 

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/KeyGeneratorConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/KeyGeneratorConfiguration.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding;
+package org.apache.shardingsphere.sharding.api.config;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
-import org.apache.shardingsphere.spi.keygen.KeyGenerateAlgorithm;
+import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
 
 /**
  * Key generator configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/ShardingRuleConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/ShardingRuleConfiguration.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding;
+package org.apache.shardingsphere.sharding.api.config;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.api.config.sharding.strategy.ShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.ShardingStrategyConfiguration;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import java.util.Collection;

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/TableRuleConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/TableRuleConfiguration.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding;
+package org.apache.shardingsphere.sharding.api.config;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.api.config.sharding.strategy.ShardingStrategyConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.ShardingStrategyConfiguration;
 
 /**
  * Table rule configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/strategy/ComplexShardingStrategyConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/ComplexShardingStrategyConfiguration.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
-import org.apache.shardingsphere.api.sharding.complex.ComplexKeysShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
 
 /**
  * Complex sharding strategy configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/strategy/HintShardingStrategyConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/HintShardingStrategyConfiguration.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
 import com.google.common.base.Preconditions;
 import lombok.Getter;
-import org.apache.shardingsphere.api.sharding.hint.HintShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
 
 /**
  * Hint sharding strategy configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/strategy/NoneShardingStrategyConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/NoneShardingStrategyConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
 /**
  * None sharding strategy configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/strategy/ShardingStrategyConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/ShardingStrategyConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
 /**
  * Sharding strategy configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/config/sharding/strategy/StandardShardingStrategyConfiguration.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/StandardShardingStrategyConfiguration.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
-import org.apache.shardingsphere.api.sharding.standard.StandardShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
 
 /**
  * Standard strategy configuration.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/hint/HintManager.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/hint/HintManager.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.hint;
+package org.apache.shardingsphere.sharding.api.hint;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/ShardingValue.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/ShardingValue.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding;
+package org.apache.shardingsphere.sharding.api.sharding;
 
 /**
  * Sharding value.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/complex/ComplexKeysShardingAlgorithm.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingAlgorithm.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.complex;
+package org.apache.shardingsphere.sharding.api.sharding.complex;
 
-import org.apache.shardingsphere.spi.algorithm.ShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.algorithm.ShardingAlgorithm;
 
 import java.util.Collection;
 

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/complex/ComplexKeysShardingValue.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/complex/ComplexKeysShardingValue.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.complex;
+package org.apache.shardingsphere.sharding.api.sharding.complex;
 
 import com.google.common.collect.Range;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.api.sharding.ShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.ShardingValue;
 
 import java.util.Collection;
 import java.util.Map;

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/hint/HintShardingAlgorithm.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingAlgorithm.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.hint;
+package org.apache.shardingsphere.sharding.api.sharding.hint;
 
-import org.apache.shardingsphere.spi.algorithm.ShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.algorithm.ShardingAlgorithm;
 
 import java.util.Collection;
 

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/hint/HintShardingValue.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/hint/HintShardingValue.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.hint;
+package org.apache.shardingsphere.sharding.api.sharding.hint;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.api.sharding.ShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.ShardingValue;
 
 import java.util.Collection;
 

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/standard/PreciseShardingValue.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/PreciseShardingValue.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.standard;
+package org.apache.shardingsphere.sharding.api.sharding.standard;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.api.sharding.ShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.ShardingValue;
 
 /**
  * Sharding value for precise.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/standard/RangeShardingValue.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/RangeShardingValue.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.standard;
+package org.apache.shardingsphere.sharding.api.sharding.standard;
 
 import com.google.common.collect.Range;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.api.sharding.ShardingValue;
+import org.apache.shardingsphere.sharding.api.sharding.ShardingValue;
 
 /**
  * Sharding value for range.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/api/sharding/standard/StandardShardingAlgorithm.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/StandardShardingAlgorithm.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.sharding.standard;
+package org.apache.shardingsphere.sharding.api.sharding.standard;
 
-import org.apache.shardingsphere.spi.algorithm.ShardingAlgorithm;
+import org.apache.shardingsphere.sharding.spi.algorithm.ShardingAlgorithm;
 
 import java.util.Collection;
 

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/spi/algorithm/ShardingAlgorithm.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/spi/algorithm/ShardingAlgorithm.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.algorithm;
+package org.apache.shardingsphere.sharding.spi.algorithm;
 
-import org.apache.shardingsphere.spi.type.TypedSPI;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
 
 /**
  * Sharding algorithm.

sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/spi/keygen/KeyGenerateAlgorithm.java → sharding-core/sharding-core-api/src/main/java/org/apache/shardingsphere/sharding/spi/keygen/KeyGenerateAlgorithm.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.keygen;
+package org.apache.shardingsphere.sharding.spi.keygen;
 
-import org.apache.shardingsphere.spi.type.TypedSPI;
+import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
 
 /**
  * Key generate algorithm.

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/config/sharding/KeyGeneratorConfigurationTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/config/KeyGeneratorConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding;
+package org.apache.shardingsphere.sharding.api.config;
 
 import org.junit.Test;
 

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/config/sharding/TableRuleConfigurationTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/config/TableRuleConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding;
+package org.apache.shardingsphere.sharding.api.config;
 
 import org.junit.Test;
 

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/config/sharding/strategy/ComplexShardingStrategyConfigurationTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/config/strategy/ComplexShardingStrategyConfigurationTest.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
-import org.apache.shardingsphere.api.sharding.complex.ComplexKeysShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/config/sharding/strategy/HintShardingStrategyConfigurationTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/config/strategy/HintShardingStrategyConfigurationTest.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
-import org.apache.shardingsphere.api.sharding.hint.HintShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/config/sharding/strategy/StandardShardingStrategyConfigurationTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/config/strategy/StandardShardingStrategyConfigurationTest.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.config.sharding.strategy;
+package org.apache.shardingsphere.sharding.api.config.strategy;
 
-import org.apache.shardingsphere.api.sharding.standard.StandardShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;

sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/api/hint/HintManagerTest.java → sharding-core/sharding-core-api/src/test/java/org/apache/shardingsphere/sharding/api/hint/HintManagerTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.hint;
+package org.apache.shardingsphere.sharding.api.hint;
 
 import org.junit.Test;