for #1853, refactor spi package

sharding-core/src/main/java/org/apache/shardingsphere/api/algorithm/masterslave/MasterSlaveLoadBalanceAlgorithmFactory.java

@@ -17,8 +17,9 @@
 
 package org.apache.shardingsphere.api.algorithm.masterslave;
 
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 /**
  * Master-slave database load-balance algorithm factory.

sharding-core/src/main/java/org/apache/shardingsphere/api/algorithm/masterslave/impl/RandomMasterSlaveLoadBalanceAlgorithm.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.api.algorithm.masterslave.impl;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 import java.util.List;
 import java.util.Properties;

sharding-core/src/main/java/org/apache/shardingsphere/api/algorithm/masterslave/impl/RoundRobinMasterSlaveLoadBalanceAlgorithm.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.api.algorithm.masterslave.impl;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 import java.util.List;
 import java.util.Properties;

sharding-core/src/main/java/org/apache/shardingsphere/api/config/masterslave/MasterSlaveRuleConfiguration.java

@@ -20,8 +20,8 @@ package org.apache.shardingsphere.api.config.masterslave;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 import org.apache.shardingsphere.api.config.RuleConfiguration;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 import java.util.Collection;
 

sharding-core/src/main/java/org/apache/shardingsphere/core/encrypt/ShardingEncryptorFactory.java

@@ -17,8 +17,9 @@
 
 package org.apache.shardingsphere.core.encrypt;
 
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.spi.algorithm.encrypt.ShardingEncryptor;
 
 /**
  * Sharding encryptor factory.

sharding-core/src/main/java/org/apache/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java

@@ -24,8 +24,8 @@ import org.apache.shardingsphere.core.executor.StatementExecuteUnit;
 import org.apache.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler;
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaDataFactory;
-import org.apache.shardingsphere.spi.hook.executor.SPISQLExecutionHook;
-import org.apache.shardingsphere.spi.hook.executor.SQLExecutionHook;
+import org.apache.shardingsphere.core.spi.hook.SPISQLExecutionHook;
+import org.apache.shardingsphere.spi.hook.SQLExecutionHook;
 
 import java.sql.SQLException;
 import java.util.Collection;

sharding-core/src/main/java/org/apache/shardingsphere/core/keygen/ShardingKeyGeneratorFactory.java

@@ -17,8 +17,9 @@
 
 package org.apache.shardingsphere.core.keygen;
 
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.algorithm.BaseAlgorithmFactory;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 /**
  * Key generator factory.

sharding-core/src/main/java/org/apache/shardingsphere/core/keygen/impl/SnowflakeShardingKeyGenerator.java

@@ -21,8 +21,8 @@ import com.google.common.base.Preconditions;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
 import org.apache.shardingsphere.core.keygen.TimeService;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Calendar;
 import java.util.Properties;

sharding-core/src/main/java/org/apache/shardingsphere/core/keygen/impl/UUIDShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.core.keygen.impl;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 import java.util.UUID;

sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java

@@ -52,9 +52,9 @@ import org.apache.shardingsphere.core.routing.type.RoutingTable;
 import org.apache.shardingsphere.core.routing.type.TableUnit;
 import org.apache.shardingsphere.core.rule.BindingTableRule;
 import org.apache.shardingsphere.core.rule.ShardingRule;
+import org.apache.shardingsphere.core.spi.hook.SPIRewriteHook;
 import org.apache.shardingsphere.core.util.SQLUtil;
-import org.apache.shardingsphere.spi.hook.rewrite.RewriteHook;
-import org.apache.shardingsphere.spi.hook.rewrite.SPIRewriteHook;
+import org.apache.shardingsphere.spi.hook.RewriteHook;
 
 import java.util.HashMap;
 import java.util.List;

sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java

@@ -47,9 +47,9 @@ import org.apache.shardingsphere.core.routing.type.TableUnit;
 import org.apache.shardingsphere.core.rule.BindingTableRule;
 import org.apache.shardingsphere.core.rule.ShardingRule;
 import org.apache.shardingsphere.core.rule.TableRule;
+import org.apache.shardingsphere.core.spi.hook.SPIParsingHook;
 import org.apache.shardingsphere.core.util.SQLLogger;
-import org.apache.shardingsphere.spi.hook.parsing.ParsingHook;
-import org.apache.shardingsphere.spi.hook.parsing.SPIParsingHook;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 
 import java.util.LinkedList;
 import java.util.List;

sharding-core/src/main/java/org/apache/shardingsphere/core/routing/strategy/ShardingEncryptorStrategy.java

@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.core.routing.strategy;
 
 import lombok.Getter;
-import org.apache.shardingsphere.core.encrypt.ShardingEncryptor;
 import org.apache.shardingsphere.core.exception.ShardingConfigurationException;
+import org.apache.shardingsphere.spi.algorithm.encrypt.ShardingEncryptor;
 
 import java.util.List;
 

sharding-core/src/main/java/org/apache/shardingsphere/core/rule/MasterSlaveRule.java

@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.core.rule;
 
 import lombok.Getter;
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmFactory;
 import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 import java.util.Collection;
 

sharding-core/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java

@@ -29,13 +29,13 @@ import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
 import org.apache.shardingsphere.api.config.sharding.strategy.ShardingStrategyConfiguration;
 import org.apache.shardingsphere.core.exception.ShardingConfigurationException;
 import org.apache.shardingsphere.core.exception.ShardingException;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
 import org.apache.shardingsphere.core.keygen.ShardingKeyGeneratorFactory;
 import org.apache.shardingsphere.core.parsing.parser.context.condition.Column;
 import org.apache.shardingsphere.core.routing.strategy.ShardingStrategy;
 import org.apache.shardingsphere.core.routing.strategy.ShardingStrategyFactory;
 import org.apache.shardingsphere.core.routing.strategy.hint.HintShardingStrategy;
 import org.apache.shardingsphere.core.routing.strategy.none.NoneShardingStrategy;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.ArrayList;
 import java.util.Collection;

sharding-core/src/main/java/org/apache/shardingsphere/core/rule/TableRule.java

@@ -26,15 +26,15 @@ import lombok.ToString;
 import org.apache.shardingsphere.api.config.encryptor.EncryptorConfiguration;
 import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
 import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
-import org.apache.shardingsphere.core.encrypt.ShardingEncryptor;
 import org.apache.shardingsphere.core.encrypt.ShardingEncryptorFactory;
 import org.apache.shardingsphere.core.exception.ShardingException;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
 import org.apache.shardingsphere.core.keygen.ShardingKeyGeneratorFactory;
 import org.apache.shardingsphere.core.routing.strategy.ShardingEncryptorStrategy;
 import org.apache.shardingsphere.core.routing.strategy.ShardingStrategy;
 import org.apache.shardingsphere.core.routing.strategy.ShardingStrategyFactory;
 import org.apache.shardingsphere.core.util.InlineExpressionParser;
+import org.apache.shardingsphere.spi.algorithm.encrypt.ShardingEncryptor;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Collection;
 import java.util.Collections;

sharding-core/src/main/java/org/apache/shardingsphere/spi/NewInstanceServiceLoader.java → sharding-core/src/main/java/org/apache/shardingsphere/core/spi/NewInstanceServiceLoader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi;
+package org.apache.shardingsphere.core.spi;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

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

@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.algorithm;
+package org.apache.shardingsphere.core.spi.algorithm;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.core.exception.ShardingConfigurationException;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.algorithm.BaseAlgorithm;
 
 import java.util.Collection;
 import java.util.Properties;

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/parsing/SPIParsingHook.java → sharding-core/src/main/java/org/apache/shardingsphere/core/spi/hook/SPIParsingHook.java

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.parsing;
+package org.apache.shardingsphere.core.spi.hook;
 
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parsing.parser.sql.SQLStatement;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 
 import java.util.Collection;
 

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/rewrite/SPIRewriteHook.java → sharding-core/src/main/java/org/apache/shardingsphere/core/spi/hook/SPIRewriteHook.java

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.rewrite;
+package org.apache.shardingsphere.core.spi.hook;
 
 import org.apache.shardingsphere.core.routing.SQLUnit;
 import org.apache.shardingsphere.core.routing.type.TableUnit;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.hook.RewriteHook;
 
 import java.util.Collection;
 

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/root/SPIRootInvokeHook.java → sharding-core/src/main/java/org/apache/shardingsphere/core/spi/hook/SPIRootInvokeHook.java

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.root;
+package org.apache.shardingsphere.core.spi.hook;
 
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 
 import java.util.Collection;
 

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/executor/SPISQLExecutionHook.java → sharding-core/src/main/java/org/apache/shardingsphere/core/spi/hook/SPISQLExecutionHook.java

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.executor;
+package org.apache.shardingsphere.core.spi.hook;
 
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.routing.RouteUnit;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.hook.SQLExecutionHook;
 
 import java.util.Collection;
 import java.util.Map;

sharding-core/src/main/java/org/apache/shardingsphere/core/yaml/swapper/impl/MasterSlaveRuleConfigurationYamlSwapper.java

@@ -18,11 +18,11 @@
 package org.apache.shardingsphere.core.yaml.swapper.impl;
 
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmFactory;
 import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
 import org.apache.shardingsphere.core.yaml.config.masterslave.YamlMasterSlaveRuleConfiguration;
 import org.apache.shardingsphere.core.yaml.swapper.YamlSwapper;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 
 import java.util.Properties;
 

sharding-core/src/main/java/org/apache/shardingsphere/core/encrypt/ShardingEncryptor.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/algorithm/encrypt/ShardingEncryptor.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.core.encrypt;
+package org.apache.shardingsphere.spi.algorithm.encrypt;
 
 import org.apache.shardingsphere.spi.algorithm.BaseAlgorithm;
 

sharding-core/src/main/java/org/apache/shardingsphere/core/encrypt/ShardingQueryAssistedEncryptor.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/algorithm/encrypt/ShardingQueryAssistedEncryptor.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.core.encrypt;
+package org.apache.shardingsphere.spi.algorithm.encrypt;
 
 /**
  * Sharding query assisted encryptor.

sharding-core/src/main/java/org/apache/shardingsphere/core/keygen/ShardingKeyGenerator.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/algorithm/keygen/ShardingKeyGenerator.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.core.keygen;
+package org.apache.shardingsphere.spi.algorithm.keygen;
 
 import org.apache.shardingsphere.spi.algorithm.BaseAlgorithm;
 

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.api.algorithm.masterslave;
+package org.apache.shardingsphere.spi.algorithm.masterslave;
 
 import org.apache.shardingsphere.spi.algorithm.BaseAlgorithm;
 

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/parsing/ParsingHook.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/ParsingHook.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.parsing;
+package org.apache.shardingsphere.spi.hook;
 
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parsing.parser.sql.SQLStatement;

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/rewrite/RewriteHook.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/RewriteHook.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.rewrite;
+package org.apache.shardingsphere.spi.hook;
 
 import org.apache.shardingsphere.core.routing.SQLUnit;
 import org.apache.shardingsphere.core.routing.type.TableUnit;

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/root/RootInvokeHook.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/RootInvokeHook.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.root;
+package org.apache.shardingsphere.spi.hook;
 
 /**
  * Root invoke hook.

sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/executor/SQLExecutionHook.java → sharding-core/src/main/java/org/apache/shardingsphere/spi/hook/SQLExecutionHook.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.spi.hook.executor;
+package org.apache.shardingsphere.spi.hook;
 
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.routing.RouteUnit;

sharding-core/src/test/java/org/apache/shardingsphere/api/config/masterslave/MasterSlaveRuleConfigurationTest.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.api.config.masterslave;
 
-import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 import org.apache.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmFactory;
+import org.apache.shardingsphere.spi.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 

sharding-core/src/test/java/org/apache/shardingsphere/core/encrypt/fixture/TestShardingEncryptor.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.core.encrypt.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.encrypt.ShardingEncryptor;
+import org.apache.shardingsphere.spi.algorithm.encrypt.ShardingEncryptor;
 
 import java.util.Properties;
 

sharding-core/src/test/java/org/apache/shardingsphere/core/keygen/fixture/IncrementShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.core.keygen.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;

sharding-core/src/test/java/org/apache/shardingsphere/core/routing/strategy/ShardingEncryptorStrategyTest.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.core.routing.strategy;
 
-import org.apache.shardingsphere.core.encrypt.ShardingEncryptor;
 import org.apache.shardingsphere.core.exception.ShardingConfigurationException;
+import org.apache.shardingsphere.spi.algorithm.encrypt.ShardingEncryptor;
 import org.junit.Test;
 
 import java.util.Arrays;

sharding-core/src/test/java/org/apache/shardingsphere/spi/NewInstanceServiceLoaderTest.java

@@ -17,7 +17,8 @@
 
 package org.apache.shardingsphere.spi;
 
-import org.apache.shardingsphere.spi.hook.parsing.ParsingHook;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 import org.junit.Test;
 
 import java.util.Collection;

sharding-core/src/test/java/org/apache/shardingsphere/spi/fixture/ParsingHookFixture.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.spi.fixture;
 
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parsing.parser.sql.SQLStatement;
-import org.apache.shardingsphere.spi.hook.parsing.ParsingHook;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 
 import java.util.Collection;
 import java.util.LinkedList;

sharding-core/src/test/java/org/apache/shardingsphere/spi/fixture/RewriteHookFixture.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.spi.fixture;
 
 import org.apache.shardingsphere.core.routing.SQLUnit;
 import org.apache.shardingsphere.core.routing.type.TableUnit;
-import org.apache.shardingsphere.spi.hook.rewrite.RewriteHook;
+import org.apache.shardingsphere.spi.hook.RewriteHook;
 
 import java.util.Collection;
 import java.util.LinkedList;

sharding-core/src/test/java/org/apache/shardingsphere/spi/fixture/RootInvokeHookFixture.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.spi.fixture;
 
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 
 import java.util.Collection;
 import java.util.LinkedList;

sharding-core/src/test/java/org/apache/shardingsphere/spi/fixture/SQLExecutionHookFixture.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.spi.fixture;
 
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.routing.RouteUnit;
-import org.apache.shardingsphere.spi.hook.executor.SQLExecutionHook;
+import org.apache.shardingsphere.spi.hook.SQLExecutionHook;
 
 import java.util.Collection;
 import java.util.LinkedList;

sharding-core/src/test/java/org/apache/shardingsphere/spi/hook/executor/SPISQLExecutionHookTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.spi.hook.executor;
 
+import org.apache.shardingsphere.core.spi.hook.SPISQLExecutionHook;
 import org.apache.shardingsphere.spi.fixture.SQLExecutionHookFixture;
 import org.junit.Before;
 import org.junit.Test;

sharding-core/src/test/java/org/apache/shardingsphere/spi/hook/parsing/SPIParsingHookTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.spi.hook.parsing;
 
+import org.apache.shardingsphere.core.spi.hook.SPIParsingHook;
 import org.apache.shardingsphere.spi.fixture.ParsingHookFixture;
 import org.junit.Before;
 import org.junit.Test;

sharding-core/src/test/java/org/apache/shardingsphere/spi/hook/rewrite/SPIRewriteHookTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.spi.hook.rewrite;
 
+import org.apache.shardingsphere.core.spi.hook.SPIRewriteHook;
 import org.apache.shardingsphere.spi.fixture.RewriteHookFixture;
 import org.junit.Before;
 import org.junit.Test;

sharding-core/src/test/java/org/apache/shardingsphere/spi/hook/root/SPIRootInvokeHookTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.spi.hook.root;
 
+import org.apache.shardingsphere.core.spi.hook.SPIRootInvokeHook;
 import org.apache.shardingsphere.spi.fixture.RootInvokeHookFixture;
 import org.junit.Before;
 import org.junit.Test;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java

@@ -24,11 +24,11 @@ import lombok.Getter;
 import org.apache.shardingsphere.core.constant.ConnectionMode;
 import org.apache.shardingsphere.core.hint.HintManagerHolder;
 import org.apache.shardingsphere.core.routing.router.masterslave.MasterVisitedManager;
+import org.apache.shardingsphere.core.spi.hook.SPIRootInvokeHook;
 import org.apache.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteCallback;
 import org.apache.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteTemplate;
 import org.apache.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationConnection;
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
-import org.apache.shardingsphere.spi.hook.root.SPIRootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
 import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;

sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/dbtest/fixture/ConstantShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbtest.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 

sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/fixture/IncrementShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shardingjdbc.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;

sharding-jdbc/sharding-jdbc-orchestration/src/test/java/org/apache/shardingsphere/shardingjdbc/orchestration/api/yaml/fixture/DecrementShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;

sharding-jdbc/sharding-jdbc-orchestration/src/test/java/org/apache/shardingsphere/shardingjdbc/orchestration/api/yaml/fixture/IncrementShardingKeyGenerator.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shardingjdbc.orchestration.api.yaml.fixture;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.core.keygen.ShardingKeyGenerator;
+import org.apache.shardingsphere.spi.algorithm.keygen.ShardingKeyGenerator;
 
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;

sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingParsingHook.java

@@ -23,7 +23,7 @@ import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parsing.parser.sql.SQLStatement;
 import org.apache.shardingsphere.opentracing.ShardingTracer;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.spi.hook.parsing.ParsingHook;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 
 /**
  * Open tracing parsing hook.

sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java

@@ -22,7 +22,7 @@ import io.opentracing.tag.Tags;
 import org.apache.shardingsphere.core.executor.ShardingExecuteDataMap;
 import org.apache.shardingsphere.opentracing.ShardingTracer;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 
 /**
  * Open tracing root invoke hook.

sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java

@@ -25,7 +25,7 @@ import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.routing.RouteUnit;
 import org.apache.shardingsphere.opentracing.ShardingTracer;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.spi.hook.executor.SQLExecutionHook;
+import org.apache.shardingsphere.spi.hook.SQLExecutionHook;
 
 import java.util.LinkedList;
 import java.util.List;

sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingParsingHookTest.java

@@ -22,10 +22,10 @@ import io.opentracing.tag.Tags;
 import org.apache.shardingsphere.core.exception.ShardingException;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parsing.parser.sql.SQLStatement;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.hook.SPIParsingHook;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.hook.parsing.ParsingHook;
-import org.apache.shardingsphere.spi.hook.parsing.SPIParsingHook;
+import org.apache.shardingsphere.spi.hook.ParsingHook;
 import org.hamcrest.CoreMatchers;
 import org.junit.BeforeClass;
 import org.junit.Test;

sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java

@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.opentracing.hook;
 
 import org.apache.shardingsphere.core.executor.ShardingExecuteDataMap;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
-import org.apache.shardingsphere.spi.hook.root.SPIRootInvokeHook;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.hook.SPIRootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java

@@ -25,10 +25,10 @@ import org.apache.shardingsphere.core.executor.ShardingExecuteDataMap;
 import org.apache.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import org.apache.shardingsphere.core.routing.RouteUnit;
 import org.apache.shardingsphere.core.routing.SQLUnit;
+import org.apache.shardingsphere.core.spi.NewInstanceServiceLoader;
+import org.apache.shardingsphere.core.spi.hook.SPISQLExecutionHook;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.spi.NewInstanceServiceLoader;
-import org.apache.shardingsphere.spi.hook.executor.SPISQLExecutionHook;
-import org.apache.shardingsphere.spi.hook.executor.SQLExecutionHook;
+import org.apache.shardingsphere.spi.hook.SQLExecutionHook;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/mysql/MySQLCommandExecutor.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
+import org.apache.shardingsphere.core.spi.hook.SPIRootInvokeHook;
 import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connection.BackendConnection;
 import org.apache.shardingsphere.shardingproxy.frontend.common.FrontendHandler;
 import org.apache.shardingsphere.shardingproxy.runtime.GlobalRegistry;
@@ -41,8 +42,7 @@ import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.qu
 import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLEofPacket;
 import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLErrPacket;
 import org.apache.shardingsphere.shardingproxy.transport.mysql.packet.generic.MySQLOKPacket;
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
-import org.apache.shardingsphere.spi.hook.root.SPIRootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 
 import java.sql.SQLException;
 

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/postgresql/PostgreSQLCommandExecutor.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
+import org.apache.shardingsphere.core.spi.hook.SPIRootInvokeHook;
 import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connection.BackendConnection;
 import org.apache.shardingsphere.shardingproxy.frontend.common.FrontendHandler;
 import org.apache.shardingsphere.shardingproxy.runtime.GlobalRegistry;
@@ -39,8 +40,7 @@ import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.comma
 import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.generic.PostgreSQLCommandCompletePacket;
 import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.generic.PostgreSQLErrorResponsePacket;
 import org.apache.shardingsphere.shardingproxy.transport.postgresql.packet.generic.PostgreSQLReadyForQueryPacket;
-import org.apache.shardingsphere.spi.hook.root.RootInvokeHook;
-import org.apache.shardingsphere.spi.hook.root.SPIRootInvokeHook;
+import org.apache.shardingsphere.spi.hook.RootInvokeHook;
 
 import java.sql.SQLException;
 import java.util.ArrayList;