From cfd9d7ee23f24463facc87a68f8f6707bfc1a0d6 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Wed, 26 Sep 2018 15:16:07 +0800 Subject: [PATCH] for #1302, Rename io.shardingsphere.core.spi => io.shardingsphere.spi --- .../core/executor/sql/execute/SQLExecuteCallback.java | 4 ++-- .../core/routing/router/sharding/ParsingSQLRouter.java | 4 ++-- .../{core => }/spi/executor/SPISQLExecutionHook.java | 2 +- .../{core => }/spi/executor/SQLExecutionHook.java | 2 +- .../io/shardingsphere/{core => }/spi/parsing/ParsingHook.java | 2 +- .../shardingsphere/{core => }/spi/parsing/SPIParsingHook.java | 2 +- .../io/shardingsphere/{core => }/spi/root/RootInvokeHook.java | 2 +- .../shardingsphere/{core => }/spi/root/SPIRootInvokeHook.java | 2 +- .../core/jdbc/adapter/AbstractConnectionAdapter.java | 4 ++-- .../opentracing/hook/OpenTracingParsingHook.java | 2 +- .../opentracing/hook/OpenTracingRootInvokeHook.java | 2 +- .../opentracing/hook/OpenTracingSQLExecutionHook.java | 2 +- ...onHook => io.shardingsphere.spi.executor.SQLExecutionHook} | 0 ....ParsingHook => io.shardingsphere.spi.parsing.ParsingHook} | 0 ...otInvokeHook => io.shardingsphere.spi.root.RootInvokeHook} | 0 .../opentracing/hook/OpenTracingParsingHookTest.java | 4 ++-- .../opentracing/hook/OpenTracingRootInvokeHookTest.java | 4 ++-- .../opentracing/hook/OpenTracingSQLExecutionHookTest.java | 4 ++-- .../proxy/frontend/mysql/MySQLFrontendHandler.java | 4 ++-- 19 files changed, 23 insertions(+), 23 deletions(-) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/executor/SPISQLExecutionHook.java (97%) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/executor/SQLExecutionHook.java (96%) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/parsing/ParsingHook.java (96%) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/parsing/SPIParsingHook.java (96%) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/root/RootInvokeHook.java (95%) rename sharding-core/src/main/java/io/shardingsphere/{core => }/spi/root/SPIRootInvokeHook.java (96%) rename sharding-opentracing/src/main/resources/META-INF/services/{io.shardingsphere.core.spi.executor.SQLExecutionHook => io.shardingsphere.spi.executor.SQLExecutionHook} (100%) rename sharding-opentracing/src/main/resources/META-INF/services/{io.shardingsphere.core.spi.parsing.ParsingHook => io.shardingsphere.spi.parsing.ParsingHook} (100%) rename sharding-opentracing/src/main/resources/META-INF/services/{io.shardingsphere.core.spi.root.RootInvokeHook => io.shardingsphere.spi.root.RootInvokeHook} (100%) diff --git a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java b/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java index 0fa527abfea2a..a4c6df0456b63 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java @@ -29,8 +29,8 @@ import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.metadata.datasource.DataSourceMetaDataFactory; -import io.shardingsphere.core.spi.executor.SPISQLExecutionHook; -import io.shardingsphere.core.spi.executor.SQLExecutionHook; +import io.shardingsphere.spi.executor.SPISQLExecutionHook; +import io.shardingsphere.spi.executor.SQLExecutionHook; import lombok.RequiredArgsConstructor; import java.sql.SQLException; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java b/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java index 0d56389b0eb62..384d778fd086d 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java @@ -51,8 +51,8 @@ import io.shardingsphere.core.routing.type.unicast.UnicastRoutingEngine; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.core.rule.TableRule; -import io.shardingsphere.core.spi.parsing.ParsingHook; -import io.shardingsphere.core.spi.parsing.SPIParsingHook; +import io.shardingsphere.spi.parsing.ParsingHook; +import io.shardingsphere.spi.parsing.SPIParsingHook; import io.shardingsphere.core.util.SQLLogger; import lombok.RequiredArgsConstructor; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SPISQLExecutionHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/executor/SPISQLExecutionHook.java similarity index 97% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SPISQLExecutionHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/executor/SPISQLExecutionHook.java index 3b1aad79d0b64..a2db6d60a7ccb 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SPISQLExecutionHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/executor/SPISQLExecutionHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.executor; +package io.shardingsphere.spi.executor; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.routing.RouteUnit; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SQLExecutionHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/executor/SQLExecutionHook.java similarity index 96% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SQLExecutionHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/executor/SQLExecutionHook.java index d4a567929d9bc..5fb7f8faf9713 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SQLExecutionHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/executor/SQLExecutionHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.executor; +package io.shardingsphere.spi.executor; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.routing.RouteUnit; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/ParsingHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/parsing/ParsingHook.java similarity index 96% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/ParsingHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/parsing/ParsingHook.java index 02dc7a39a396a..ec31bea5cc982 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/ParsingHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/parsing/ParsingHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.parsing; +package io.shardingsphere.spi.parsing; /** * Parsing hook. diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/SPIParsingHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/parsing/SPIParsingHook.java similarity index 96% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/SPIParsingHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/parsing/SPIParsingHook.java index c0160803413dc..a1f2e02675225 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/SPIParsingHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/parsing/SPIParsingHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.parsing; +package io.shardingsphere.spi.parsing; import java.util.ServiceLoader; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/root/RootInvokeHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/root/RootInvokeHook.java similarity index 95% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/root/RootInvokeHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/root/RootInvokeHook.java index 87995ad8eff78..809a6d8479114 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/root/RootInvokeHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/root/RootInvokeHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.root; +package io.shardingsphere.spi.root; /** * Root invoke hook. diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/root/SPIRootInvokeHook.java b/sharding-core/src/main/java/io/shardingsphere/spi/root/SPIRootInvokeHook.java similarity index 96% rename from sharding-core/src/main/java/io/shardingsphere/core/spi/root/SPIRootInvokeHook.java rename to sharding-core/src/main/java/io/shardingsphere/spi/root/SPIRootInvokeHook.java index e3299cb238cea..913a57899f435 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/spi/root/SPIRootInvokeHook.java +++ b/sharding-core/src/main/java/io/shardingsphere/spi/root/SPIRootInvokeHook.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.spi.root; +package io.shardingsphere.spi.root; import java.util.ServiceLoader; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java index e298a110e3b1e..cc0c65b67a56a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java @@ -30,8 +30,8 @@ import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteTemplate; import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationConnection; import io.shardingsphere.core.routing.router.masterslave.MasterVisitedManager; -import io.shardingsphere.core.spi.root.RootInvokeHook; -import io.shardingsphere.core.spi.root.SPIRootInvokeHook; +import io.shardingsphere.spi.root.RootInvokeHook; +import io.shardingsphere.spi.root.SPIRootInvokeHook; import io.shardingsphere.core.transaction.TransactionTypeHolder; import javax.sql.DataSource; diff --git a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHook.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHook.java index c358365d2a4d1..6d51d05f60017 100644 --- a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHook.java +++ b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHook.java @@ -19,7 +19,7 @@ import io.opentracing.Span; import io.opentracing.tag.Tags; -import io.shardingsphere.core.spi.parsing.ParsingHook; +import io.shardingsphere.spi.parsing.ParsingHook; import io.shardingsphere.opentracing.ShardingTracer; import io.shardingsphere.opentracing.constant.ShardingTags; diff --git a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java index bb850ecc80ba8..cd85d686c8b21 100644 --- a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java +++ b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java @@ -20,7 +20,7 @@ import io.opentracing.ActiveSpan; import io.opentracing.tag.Tags; import io.shardingsphere.core.executor.ShardingExecuteDataMap; -import io.shardingsphere.core.spi.root.RootInvokeHook; +import io.shardingsphere.spi.root.RootInvokeHook; import io.shardingsphere.opentracing.ShardingTracer; import io.shardingsphere.opentracing.constant.ShardingTags; diff --git a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java index 96285b1552e25..7dc54b3bb5adc 100644 --- a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java +++ b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java @@ -24,7 +24,7 @@ import io.shardingsphere.core.executor.ShardingExecuteDataMap; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.routing.RouteUnit; -import io.shardingsphere.core.spi.executor.SQLExecutionHook; +import io.shardingsphere.spi.executor.SQLExecutionHook; import io.shardingsphere.opentracing.ShardingTracer; import io.shardingsphere.opentracing.constant.ShardingTags; diff --git a/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.executor.SQLExecutionHook b/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.executor.SQLExecutionHook similarity index 100% rename from sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.executor.SQLExecutionHook rename to sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.executor.SQLExecutionHook diff --git a/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.parsing.ParsingHook b/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.parsing.ParsingHook similarity index 100% rename from sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.parsing.ParsingHook rename to sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.parsing.ParsingHook diff --git a/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.root.RootInvokeHook b/sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.root.RootInvokeHook similarity index 100% rename from sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.core.spi.root.RootInvokeHook rename to sharding-opentracing/src/main/resources/META-INF/services/io.shardingsphere.spi.root.RootInvokeHook diff --git a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHookTest.java b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHookTest.java index b3f0f8c66ba87..89ffb53552c9e 100644 --- a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHookTest.java +++ b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingParsingHookTest.java @@ -20,8 +20,8 @@ import io.opentracing.mock.MockSpan; import io.opentracing.tag.Tags; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.spi.parsing.ParsingHook; -import io.shardingsphere.core.spi.parsing.SPIParsingHook; +import io.shardingsphere.spi.parsing.ParsingHook; +import io.shardingsphere.spi.parsing.SPIParsingHook; import io.shardingsphere.opentracing.constant.ShardingTags; import org.hamcrest.CoreMatchers; import org.junit.Test; diff --git a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java index 2f2f042e61aa7..e5f34aa539980 100644 --- a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java +++ b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java @@ -18,8 +18,8 @@ package io.shardingsphere.opentracing.hook; import io.shardingsphere.core.executor.ShardingExecuteDataMap; -import io.shardingsphere.core.spi.root.RootInvokeHook; -import io.shardingsphere.core.spi.root.SPIRootInvokeHook; +import io.shardingsphere.spi.root.RootInvokeHook; +import io.shardingsphere.spi.root.SPIRootInvokeHook; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java index 91440a870dab5..fbfd25d7f87b9 100644 --- a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java +++ b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java @@ -25,8 +25,8 @@ import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLUnit; -import io.shardingsphere.core.spi.executor.SPISQLExecutionHook; -import io.shardingsphere.core.spi.executor.SQLExecutionHook; +import io.shardingsphere.spi.executor.SPISQLExecutionHook; +import io.shardingsphere.spi.executor.SQLExecutionHook; import io.shardingsphere.opentracing.constant.ShardingTags; import org.hamcrest.CoreMatchers; import org.junit.After; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java index 1508b2d39fed0..fef7d5ba9dfbe 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java @@ -22,8 +22,8 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoopGroup; -import io.shardingsphere.core.spi.root.RootInvokeHook; -import io.shardingsphere.core.spi.root.SPIRootInvokeHook; +import io.shardingsphere.spi.root.RootInvokeHook; +import io.shardingsphere.spi.root.SPIRootInvokeHook; import io.shardingsphere.proxy.backend.jdbc.connection.BackendConnection; import io.shardingsphere.proxy.config.ProxyContext; import io.shardingsphere.proxy.frontend.common.FrontendHandler;