Merge shardingsphere-spi into shardingsphere-common (#5635)

* Move shardingsphere-spi into shardingsphere-common

* remove shardingsphere-spi

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

@@ -26,8 +26,8 @@ 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.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.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/strategy/spi/Encryptor.java

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

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.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 
 import java.util.List;
 

master-slave-core/master-slave-core-common/src/main/java/org/apache/shardingsphere/masterslave/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.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.masterslave.spi.MasterSlaveLoadBalanceAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 
 import java.util.Collection;
 import java.util.HashMap;

pom.xml

@@ -30,8 +30,6 @@
     <name>${project.artifactId}</name>
     
     <modules>
-        <module>shardingsphere-spi</module>
-        
         <module>shardingsphere-sql-parser</module>
         <module>shardingsphere-database-protocol</module>
         <module>shardingsphere-underlying</module>

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

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.route.time.spi;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.sharding.route.time.exception.NoDatabaseSQLEntrySupportException;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 
 import java.util.Collection;
 

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

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.spi.algorithm;
 
-import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 
 /**
  * Sharding algorithm.

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

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.spi.keygen;
 
-import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 
 /**
  * Key generate algorithm.

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

@@ -28,9 +28,9 @@ import org.apache.shardingsphere.sharding.strategy.algorithm.sharding.inline.Inl
 import org.apache.shardingsphere.sharding.strategy.route.ShardingStrategy;
 import org.apache.shardingsphere.sharding.strategy.route.ShardingStrategyFactory;
 import org.apache.shardingsphere.sharding.strategy.route.none.NoneShardingStrategy;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.exception.ShardingSphereConfigurationException;
 import org.apache.shardingsphere.underlying.common.datanode.DataNode;
 import org.apache.shardingsphere.underlying.common.rule.DataNodeRoutedRule;

sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java

@@ -20,9 +20,9 @@ package org.apache.shardingsphere.sharding.yaml.swapper;
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.YamlKeyGeneratorConfiguration;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;
 
 /**

sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingStrategyConfigurationYamlSwapper.java

@@ -32,9 +32,9 @@ import org.apache.shardingsphere.sharding.yaml.config.strategy.YamlHintShardingS
 import org.apache.shardingsphere.sharding.yaml.config.strategy.YamlNoneShardingStrategyConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.strategy.YamlShardingAlgorithmConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.strategy.YamlStandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.algorithm.ShardingAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.exception.ShardingSphereException;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlSwapper;
 

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/sharding/log/ShardingConfigurationLoggerTest.java

@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import org.apache.shardingsphere.sharding.api.config.TableRuleConfiguration;
 import org.apache.shardingsphere.sharding.api.config.strategy.NoneShardingStrategyConfiguration;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.underlying.common.log.ConfigurationLogger;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlRuleConfigurationSwapper;
 import org.junit.Before;

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java

@@ -30,7 +30,7 @@ import org.apache.shardingsphere.sharding.strategy.route.ShardingStrategy;
 import org.apache.shardingsphere.sharding.strategy.route.none.NoneShardingStrategy;
 import org.apache.shardingsphere.sharding.strategy.route.standard.StandardShardingStrategy;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.exception.ShardingSphereConfigurationException;
 import org.apache.shardingsphere.underlying.common.datanode.DataNode;
 import org.junit.Test;

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/sharding/rule/TableRuleTest.java

@@ -24,9 +24,9 @@ import org.apache.shardingsphere.sharding.api.config.strategy.NoneShardingStrate
 import org.apache.shardingsphere.sharding.api.config.strategy.StandardShardingStrategyConfiguration;
 import org.apache.shardingsphere.sharding.strategy.algorithm.keygen.fixture.IncrementKeyGenerateAlgorithm;
 import org.apache.shardingsphere.sharding.strategy.algorithm.sharding.inline.InlineShardingAlgorithm;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.exception.ShardingSphereConfigurationException;
 import org.apache.shardingsphere.underlying.common.datanode.DataNode;
 import org.junit.BeforeClass;

sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/KeyGeneratorConfigurationYamlSwapperTest.java

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.yaml.swapper;
 import org.apache.shardingsphere.sharding.api.config.KeyGeneratorConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.YamlKeyGeneratorConfiguration;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.junit.Test;
 
 import java.util.Properties;

sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/sharding/route/spi/SPITimeService.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.route.spi;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 
 import java.util.Collection;
 import java.util.Date;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutor.java

@@ -21,8 +21,8 @@ import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteExecu
 import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteQueryExecutorCallback;
 import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteUpdateExecutorCallback;
 import org.apache.shardingsphere.shardingjdbc.jdbc.core.context.RuntimeContext;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.common.metadata.refresh.MetaDataRefreshStrategy;
 import org.apache.shardingsphere.underlying.common.metadata.refresh.MetaDataRefreshStrategyFactory;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutor.java

@@ -21,8 +21,8 @@ import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteExecu
 import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteQueryExecutorCallback;
 import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteUpdateExecutorCallback;
 import org.apache.shardingsphere.shardingjdbc.jdbc.core.context.RuntimeContext;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.common.metadata.refresh.MetaDataRefreshStrategy;
 import org.apache.shardingsphere.underlying.common.metadata.refresh.MetaDataRefreshStrategyFactory;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/batch/BatchPreparedStatementExecutor.java

@@ -21,8 +21,8 @@ import com.google.common.base.Preconditions;
 import lombok.Getter;
 import org.apache.shardingsphere.shardingjdbc.executor.callback.RuleExecuteBatchExecutorCallback;
 import org.apache.shardingsphere.shardingjdbc.jdbc.core.context.RuntimeContext;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.common.rule.DataNodeRoutedRule;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/callback/RuleExecuteBatchExecutorCallback.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingjdbc.executor.callback;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.execute.jdbc.executor.SQLExecutorCallback;
 

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/callback/RuleExecuteExecutorCallback.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingjdbc.executor.callback;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.execute.jdbc.executor.SQLExecutorCallback;
 

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/callback/RuleExecuteQueryExecutorCallback.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingjdbc.executor.callback;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.QueryResult;
 import org.apache.shardingsphere.underlying.executor.sql.execute.jdbc.executor.SQLExecutorCallback;

sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/callback/RuleExecuteUpdateExecutorCallback.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingjdbc.executor.callback;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.execute.jdbc.executor.SQLExecutorCallback;
 

sharding-metrics/sharding-metrics-spi/pom.xml

@@ -25,15 +25,10 @@
         <version>5.0.0-RC1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    
     <artifactId>sharding-metrics-spi</artifactId>
-
+    
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-metrics-configuration</artifactId>

sharding-metrics/sharding-metrics-spi/src/main/java/org/apache/shardingsphere/metrics/spi/MetricsTrackerManager.java

@@ -19,7 +19,7 @@ package org.apache.shardingsphere.metrics.spi;
 
 import org.apache.shardingsphere.metrics.api.MetricsTrackerFactory;
 import org.apache.shardingsphere.metrics.configuration.config.MetricsConfiguration;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 
 /**
  * Metrics tracker manager.

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

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.opentracing.hook;
 import io.opentracing.mock.MockSpan;
 import io.opentracing.tag.Tags;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sql.parser.hook.ParsingHook;
 import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
 import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;

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

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.opentracing.hook;
 import org.apache.shardingsphere.underlying.executor.kernel.ExecutorDataMap;
 import org.apache.shardingsphere.underlying.common.hook.RootInvokeHook;
 import org.apache.shardingsphere.underlying.common.hook.SPIRootInvokeHook;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

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

@@ -24,7 +24,7 @@ import io.opentracing.tag.Tags;
 import org.apache.shardingsphere.opentracing.constant.ShardingTags;
 import org.apache.shardingsphere.underlying.executor.sql.hook.SPISQLExecutionHook;
 import org.apache.shardingsphere.underlying.executor.sql.hook.SQLExecutionHook;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.underlying.common.database.metadata.DataSourceMetaData;
 import org.apache.shardingsphere.underlying.executor.kernel.ExecutorDataMap;
 import org.junit.After;

sharding-orchestration/sharding-orchestration-center/sharding-orchestration-center-api/src/main/java/org/apache/shardingsphere/orchestration/center/CenterRepository.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.orchestration.center;
 
 import org.apache.shardingsphere.orchestration.center.listener.DataChangedEventListener;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 import org.apache.shardingsphere.orchestration.center.config.CenterConfiguration;
 
 import java.util.List;

sharding-orchestration/sharding-orchestration-core/sharding-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacade.java

@@ -33,8 +33,8 @@ import org.apache.shardingsphere.orchestration.core.facade.properties.Orchestrat
 import org.apache.shardingsphere.orchestration.core.facade.properties.OrchestrationPropertyKey;
 import org.apache.shardingsphere.orchestration.core.metadatacenter.MetaDataCenter;
 import org.apache.shardingsphere.orchestration.core.registrycenter.RegistryCenter;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.DataSourceConfiguration;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 

sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/execute/JDBCExecuteEngine.java

@@ -32,8 +32,8 @@ import org.apache.shardingsphere.shardingproxy.backend.response.BackendResponse;
 import org.apache.shardingsphere.shardingproxy.backend.response.query.QueryHeader;
 import org.apache.shardingsphere.shardingproxy.backend.response.query.QueryResponse;
 import org.apache.shardingsphere.shardingproxy.backend.response.update.UpdateResponse;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement;
 import org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement;

sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/execute/callback/ProxySQLExecutorCallback.java

@@ -24,7 +24,7 @@ import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.execut
 import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.wrapper.JDBCExecutorWrapper;
 import org.apache.shardingsphere.shardingproxy.backend.response.query.QueryHeader;
 import org.apache.shardingsphere.shardingproxy.backend.schema.ShardingSphereSchemas;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sql.parser.binder.segment.select.projection.ProjectionsContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatementContext;

sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/execute/callback/RuleProxySQLExecutorCallback.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.execute.callback;
 
 import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.execute.response.ExecuteResponse;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.sql.execute.jdbc.executor.SQLExecutorCallback;
 

sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/DatabaseProtocolFrontendEngineFactory.java

@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shardingproxy.frontend;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.underlying.common.database.type.DatabaseTypes;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.shardingproxy.frontend.spi.DatabaseProtocolFrontendEngine;
 import org.apache.shardingsphere.underlying.common.database.type.DatabaseType;
 

sharding-scaling/sharding-scaling-core/src/main/java/org/apache/shardingsphere/shardingscaling/core/spi/ScalingEntryLoader.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingscaling.core.spi;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import java.util.Map;
 import java.util.TreeMap;
 

sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/namespace/factorybean/KeyGenerateAlgorithmFactoryBean.java

@@ -21,9 +21,9 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import java.util.Properties;
 import lombok.Getter;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.keygen.KeyGenerateAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.springframework.beans.factory.FactoryBean;
 
 /**

sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/namespace/factorybean/ShardingAlgorithmFactoryBean.java

@@ -20,9 +20,9 @@ package org.apache.shardingsphere.shardingjdbc.spring.namespace.factorybean;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import lombok.Getter;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sharding.spi.algorithm.ShardingAlgorithm;
-import org.apache.shardingsphere.sharding.spi.type.TypedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPIRegistry;
 import org.springframework.beans.factory.FactoryBean;
 
 import java.util.Properties;

sharding-spring/sharding-spring-boot-util/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourcePropertiesSetterHolder.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.spring.boot.datasource;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 
 import java.util.HashMap;
 import java.util.Map;

shardingsphere-spi/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere</artifactId>
-        <version>5.0.0-RC1-SNAPSHOT</version>
-    </parent>
-    <artifactId>shardingsphere-spi</artifactId>
-    <name>${project.artifactId}</name>
-</project>

shardingsphere-underlying/shardingsphere-common/pom.xml

@@ -29,11 +29,6 @@
     <name>${project.artifactId}</name>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shardingsphere-sql-parser-binder</artifactId>

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/hook/SPIRootInvokeHook.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.common.hook;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 
 import java.util.Collection;
 

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/metadata/schema/RuleSchemaMetaDataLoader.java

@@ -19,8 +19,8 @@ package org.apache.shardingsphere.underlying.common.metadata.schema;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaDataLoader;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/metadata/schema/spi/RuleMetaDataDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.common.metadata.schema.spi;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/metadata/schema/spi/RuleMetaDataLoader.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.common.metadata.schema.spi;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/rule/ShardingSphereRuleBuilder.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.common.rule;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import java.util.Collection;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/rule/ShardingSphereRulesBuilder.java

@@ -19,8 +19,8 @@ package org.apache.shardingsphere.underlying.common.rule;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 
 import java.util.Collection;

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/ShardingSphereServiceLoader.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/ShardingSphereServiceLoader.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi;
+package org.apache.shardingsphere.underlying.common.spi;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sharding.spi.exception.ServiceLoaderInstantiationException;
+import org.apache.shardingsphere.underlying.common.spi.exception.ServiceLoaderInstantiationException;
 
 import java.util.Collection;
 import java.util.Collections;

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/exception/ServiceLoaderInstantiationException.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/exception/ServiceLoaderInstantiationException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.exception;
+package org.apache.shardingsphere.underlying.common.spi.exception;
 
 /**
  * Service loader instantiation exception.

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/exception/ServiceProviderNotFoundException.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/exception/ServiceProviderNotFoundException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.exception;
+package org.apache.shardingsphere.underlying.common.spi.exception;
 
 /**
  * Service provider not found exception.

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/order/OrderedSPI.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/order/OrderedSPI.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.order;
+package org.apache.shardingsphere.underlying.common.spi.order;
 
 /**
  * Ordered SPI.

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/order/OrderedSPIRegistry.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/order/OrderedSPIRegistry.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.order;
+package org.apache.shardingsphere.underlying.common.spi.order;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/type/TypedSPI.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/type/TypedSPI.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.type;
+package org.apache.shardingsphere.underlying.common.spi.type;
 
 import java.util.Properties;
 

shardingsphere-spi/src/main/java/org/apache/shardingsphere/sharding/spi/type/TypedSPIRegistry.java → shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/spi/type/TypedSPIRegistry.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.type;
+package org.apache.shardingsphere.underlying.common.spi.type;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.exception.ServiceProviderNotFoundException;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.exception.ServiceProviderNotFoundException;
 
 import java.util.Optional;
 import java.util.Properties;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/yaml/engine/constructor/ShardingSphereYamlConstructor.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.underlying.common.yaml.engine.constructor;
 
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlRuleConfigurationSwapperEngine;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.constructor.Construct;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/yaml/engine/representer/ShardingSphereYamlRepresenter.java

@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.underlying.common.yaml.engine.representer;
 
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.underlying.common.yaml.engine.representer.processor.DefaultYamlTupleProcessor;
 import org.apache.shardingsphere.underlying.common.yaml.engine.representer.processor.ShardingSphereYamlTupleProcessor;
 import org.apache.shardingsphere.underlying.common.yaml.swapper.YamlRuleConfigurationSwapperEngine;

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/yaml/swapper/YamlRuleConfigurationSwapper.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.common.yaml.swapper;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.config.YamlRuleConfiguration;
 

shardingsphere-underlying/shardingsphere-common/src/main/java/org/apache/shardingsphere/underlying/common/yaml/swapper/YamlRuleConfigurationSwapperEngine.java

@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.underlying.common.yaml.swapper;
 
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
 import org.apache.shardingsphere.underlying.common.yaml.config.YamlRuleConfiguration;
 

shardingsphere-spi/src/test/java/org/apache/shardingsphere/sharding/spi/ShardingSphereServiceLoaderTest.java → shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/spi/ShardingSphereServiceLoaderTest.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi;
+package org.apache.shardingsphere.underlying.common.spi;
 
-import org.apache.shardingsphere.sharding.spi.fixture.TypedSPIFixture;
+import org.apache.shardingsphere.underlying.common.spi.fixture.TypedSPIFixture;
 import org.junit.Test;
 
 import java.util.Collection;

shardingsphere-spi/src/test/java/org/apache/shardingsphere/sharding/spi/fixture/TypedSPIFixture.java → shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/spi/fixture/TypedSPIFixture.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.fixture;
+package org.apache.shardingsphere.underlying.common.spi.fixture;
 
-import org.apache.shardingsphere.sharding.spi.type.TypedSPI;
+import org.apache.shardingsphere.underlying.common.spi.type.TypedSPI;
 
 public interface TypedSPIFixture extends TypedSPI {
 }

shardingsphere-spi/src/test/java/org/apache/shardingsphere/sharding/spi/fixture/TypedSPIFixtureImpl.java → shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/spi/fixture/TypedSPIFixtureImpl.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.spi.fixture;
+package org.apache.shardingsphere.underlying.common.spi.fixture;
 
 import lombok.Getter;
 import lombok.Setter;

shardingsphere-spi/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.fixture.TypedSPIFixture → shardingsphere-underlying/shardingsphere-common/src/test/resources/META-INF/services/org.apache.shardingsphere.underlying.common.spi.fixture.TypedSPIFixture

@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.sharding.spi.fixture.TypedSPIFixtureImpl
+org.apache.shardingsphere.underlying.common.spi.fixture.TypedSPIFixtureImpl

shardingsphere-underlying/shardingsphere-executor/src/main/java/org/apache/shardingsphere/underlying/executor/sql/group/ExecuteGroupDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.executor.sql.group;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.executor.kernel.InputGroup;
 
 import java.util.Collection;

shardingsphere-underlying/shardingsphere-executor/src/main/java/org/apache/shardingsphere/underlying/executor/sql/group/ExecuteGroupEngine.java

@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.underlying.executor.sql.group;
 
 import com.google.common.collect.Lists;
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.executor.kernel.InputGroup;
 import org.apache.shardingsphere.underlying.executor.sql.ConnectionMode;

shardingsphere-underlying/shardingsphere-executor/src/main/java/org/apache/shardingsphere/underlying/executor/sql/hook/SPISQLExecutionHook.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.executor.sql.hook;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.underlying.common.database.metadata.DataSourceMetaData;
 
 import java.util.Collection;

shardingsphere-underlying/shardingsphere-merge/src/main/java/org/apache/shardingsphere/underlying/merge/MergeEngine.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.underlying.merge;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;

shardingsphere-underlying/shardingsphere-merge/src/main/java/org/apache/shardingsphere/underlying/merge/engine/ResultProcessEngine.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.merge.engine;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 
 /**

shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/SQLRewriteEntry.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.underlying.rewrite;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;

shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/context/SQLRewriteContextDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.rewrite.context;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;
 import org.apache.shardingsphere.underlying.route.context.RouteContext;

shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/DataNodeRouter.java

@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.underlying.route;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPIRegistry;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPIRegistry;
 import org.apache.shardingsphere.sql.parser.binder.SQLStatementContextFactory;
 import org.apache.shardingsphere.sql.parser.binder.statement.CommonSQLStatementContext;
 import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;

shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/decorator/RouteDecorator.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.route.decorator;
 
-import org.apache.shardingsphere.sharding.spi.order.OrderedSPI;
+import org.apache.shardingsphere.underlying.common.spi.order.OrderedSPI;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;
 import org.apache.shardingsphere.underlying.common.metadata.ShardingSphereMetaData;
 import org.apache.shardingsphere.underlying.common.rule.ShardingSphereRule;

shardingsphere-underlying/shardingsphere-route/src/main/java/org/apache/shardingsphere/underlying/route/hook/SPIRoutingHook.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.underlying.route.hook;
 
-import org.apache.shardingsphere.sharding.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.underlying.common.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.underlying.route.context.RouteContext;