for #1172, refactor spi package

apache · Sep 24, 2018 · 4b8cd78 · 4b8cd78
1 parent c3906e4
commit 4b8cd78
Show file tree

Hide file tree

Showing 40 changed files with 132 additions and 132 deletions.
diff --git a/...ng-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java b/...ng-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java
@@ -23,9 +23,9 @@
 import io.shardingsphere.core.event.ShardingEventBusInstance;
 import io.shardingsphere.core.event.executor.SQLExecutionEvent;
 import io.shardingsphere.core.event.executor.SQLExecutionEventFactory;
-import io.shardingsphere.core.spi.executor.SQLExecutionEventHandlerSPILoader;
-import io.shardingsphere.core.spi.executor.SQLExecutionFinishEvent;
-import io.shardingsphere.core.spi.executor.SQLExecutionStartEvent;
+import io.shardingsphere.core.spi.event.executor.SQLExecutionEventHandlerLoader;
+import io.shardingsphere.core.spi.event.executor.SQLExecutionFinishEvent;
+import io.shardingsphere.core.spi.event.executor.SQLExecutionStartEvent;
 import io.shardingsphere.core.executor.ShardingExecuteCallback;
 import io.shardingsphere.core.executor.ShardingGroupExecuteCallback;
 import io.shardingsphere.core.executor.StatementExecuteUnit;
@@ -82,7 +82,7 @@ private T execute0(final StatementExecuteUnit statementExecuteUnit) throws SQLEx
         List<List<Object>> parameterSets = statementExecuteUnit.getRouteUnit().getSqlUnit().getParameterSets();
         DataSourceMetaData dataSourceMetaData = DataSourceMetaDataFactory.newInstance(databaseType, statementExecuteUnit.getStatement().getConnection().getMetaData().getURL());
         for (List<Object> each : parameterSets) {
-            SQLExecutionEventHandlerSPILoader.getInstance().handle(new SQLExecutionStartEvent(statementExecuteUnit.getRouteUnit(), each, dataSourceMetaData));
+            SQLExecutionEventHandlerLoader.getInstance().handle(new SQLExecutionStartEvent(statementExecuteUnit.getRouteUnit(), each, dataSourceMetaData));
             // TODO remove after BED removed
             shardingEventBus.post(SQLExecutionEventFactory.createEvent(sqlType, statementExecuteUnit, each, dataSourceMetaData));
         }
@@ -91,7 +91,7 @@ private T execute0(final StatementExecuteUnit statementExecuteUnit) throws SQLEx
             for (List<Object> each : parameterSets) {
                 SQLExecutionEvent finishEvent = SQLExecutionEventFactory.createEvent(sqlType, statementExecuteUnit, each, dataSourceMetaData);
                 finishEvent.setExecuteSuccess();
-                SQLExecutionEventHandlerSPILoader.getInstance().handle(new SQLExecutionFinishEvent());
+                SQLExecutionEventHandlerLoader.getInstance().handle(new SQLExecutionFinishEvent());
                 // TODO remove after BED removed
                 shardingEventBus.post(finishEvent);
             }
@@ -100,7 +100,7 @@ private T execute0(final StatementExecuteUnit statementExecuteUnit) throws SQLEx
             for (List<Object> each : parameterSets) {
                 SQLExecutionEvent finishEvent = SQLExecutionEventFactory.createEvent(sqlType, statementExecuteUnit, each, dataSourceMetaData);
                 finishEvent.setExecuteFailure(ex);
-                SQLExecutionEventHandlerSPILoader.getInstance().handle(new SQLExecutionFinishEvent());
+                SQLExecutionEventHandlerLoader.getInstance().handle(new SQLExecutionFinishEvent());
                 // TODO remove after BED removed
                 shardingEventBus.post(finishEvent);
             }

diff --git a/...g-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java b/...g-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java
@@ -19,9 +19,9 @@
 
 import com.google.common.base.Optional;
 import io.shardingsphere.core.constant.DatabaseType;
-import io.shardingsphere.core.spi.parsing.ParsingEventHandlerSPILoader;
-import io.shardingsphere.core.spi.parsing.ParsingFinishEvent;
-import io.shardingsphere.core.spi.parsing.ParsingStartEvent;
+import io.shardingsphere.core.spi.event.parsing.ParsingEventHandlerLoader;
+import io.shardingsphere.core.spi.event.parsing.ParsingFinishEvent;
+import io.shardingsphere.core.spi.event.parsing.ParsingStartEvent;
 import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData;
 import io.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import io.shardingsphere.core.optimizer.OptimizeEngineFactory;
@@ -85,7 +85,7 @@ public final class ParsingSQLRouter implements ShardingRouter {
 
     @Override
     public SQLStatement parse(final String logicSQL, final boolean useCache) {
-        ParsingEventHandlerSPILoader.getInstance().handle(new ParsingStartEvent(logicSQL));
+        ParsingEventHandlerLoader.getInstance().handle(new ParsingStartEvent(logicSQL));
         ParsingFinishEvent finishEvent = new ParsingFinishEvent();
         try {
             SQLStatement sqlStatement = new SQLParsingEngine(databaseType, logicSQL, shardingRule, shardingTableMetaData).parse(useCache);
@@ -96,7 +96,7 @@ public SQLStatement parse(final String logicSQL, final boolean useCache) {
             finishEvent.setException(ex);
             throw ex;
         } finally {
-            ParsingEventHandlerSPILoader.getInstance().handle(finishEvent);
+            ParsingEventHandlerLoader.getInstance().handle(finishEvent);
         }
     }
 

diff --git a/...sphere/core/spi/ShardingEventHandler.java → .../core/spi/event/ShardingEventHandler.java b/...sphere/core/spi/ShardingEventHandler.java → .../core/spi/event/ShardingEventHandler.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi;
+package io.shardingsphere.core.spi.event;
 
 /**
  * Sharding event handler.

diff --git a/...gsphere/core/spi/ShardingFinishEvent.java → ...e/core/spi/event/ShardingFinishEvent.java b/...gsphere/core/spi/ShardingFinishEvent.java → ...e/core/spi/event/ShardingFinishEvent.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi;
+package io.shardingsphere.core.spi.event;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ngsphere/core/spi/ShardingStartEvent.java → ...re/core/spi/event/ShardingStartEvent.java b/...ngsphere/core/spi/ShardingStartEvent.java → ...re/core/spi/event/ShardingStartEvent.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi;
+package io.shardingsphere.core.spi.event;
 
 /**
  * Sharding start event.

diff --git a/...on/close/CloseConnectionEventHandler.java → ...on/close/CloseConnectionEventHandler.java b/...on/close/CloseConnectionEventHandler.java → ...on/close/CloseConnectionEventHandler.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.close;
+package io.shardingsphere.core.spi.event.connection.close;
 
-import io.shardingsphere.core.spi.ShardingEventHandler;
+import io.shardingsphere.core.spi.event.ShardingEventHandler;
 
 /**
  * Connection event handler.

diff --git a/...CloseConnectionEventHandlerSPILoader.java → ...se/CloseConnectionEventHandlerLoader.java b/...CloseConnectionEventHandlerSPILoader.java → ...se/CloseConnectionEventHandlerLoader.java
@@ -15,22 +15,22 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.close;
+package io.shardingsphere.core.spi.event.connection.close;
 
 import java.util.ServiceLoader;
 
 /**
- * Connection event handler SPI loader.
+ * Connection event handler loader.
  *
  * @author zhangliang
  */
-public final class CloseConnectionEventHandlerSPILoader {
+public final class CloseConnectionEventHandlerLoader {
 
-    private static final CloseConnectionEventHandlerSPILoader INSTANCE = new CloseConnectionEventHandlerSPILoader();
+    private static final CloseConnectionEventHandlerLoader INSTANCE = new CloseConnectionEventHandlerLoader();
 
     private final ServiceLoader<CloseConnectionEventHandler> serviceLoader;
 
-    private CloseConnectionEventHandlerSPILoader() {
+    private CloseConnectionEventHandlerLoader() {
         serviceLoader = ServiceLoader.load(CloseConnectionEventHandler.class);
     }
 
@@ -39,7 +39,7 @@ private CloseConnectionEventHandlerSPILoader() {
      *
      * @return instance
      */
-    public static CloseConnectionEventHandlerSPILoader getInstance() {
+    public static CloseConnectionEventHandlerLoader getInstance() {
         return INSTANCE;
     }
 

diff --git a/...ion/close/CloseConnectionFinishEvent.java → ...ion/close/CloseConnectionFinishEvent.java b/...ion/close/CloseConnectionFinishEvent.java → ...ion/close/CloseConnectionFinishEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.close;
+package io.shardingsphere.core.spi.event.connection.close;
 
-import io.shardingsphere.core.spi.ShardingFinishEvent;
+import io.shardingsphere.core.spi.event.ShardingFinishEvent;
 
 /**
  * Close connection finish event.

diff --git a/...tion/close/CloseConnectionStartEvent.java → ...tion/close/CloseConnectionStartEvent.java b/...tion/close/CloseConnectionStartEvent.java → ...tion/close/CloseConnectionStartEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.close;
+package io.shardingsphere.core.spi.event.connection.close;
 
-import io.shardingsphere.core.spi.ShardingStartEvent;
+import io.shardingsphere.core.spi.event.ShardingStartEvent;
 import io.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...ection/get/GetConnectionEventHandler.java → ...ection/get/GetConnectionEventHandler.java b/...ection/get/GetConnectionEventHandler.java → ...ection/get/GetConnectionEventHandler.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.get;
+package io.shardingsphere.core.spi.event.connection.get;
 
-import io.shardingsphere.core.spi.ShardingEventHandler;
+import io.shardingsphere.core.spi.event.ShardingEventHandler;
 
 /**
  * Connection event handler.

diff --git a/...t/GetConnectionEventHandlerSPILoader.java → .../get/GetConnectionEventHandlerLoader.java b/...t/GetConnectionEventHandlerSPILoader.java → .../get/GetConnectionEventHandlerLoader.java
@@ -15,22 +15,22 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.get;
+package io.shardingsphere.core.spi.event.connection.get;
 
 import java.util.ServiceLoader;
 
 /**
- * Connection event handler SPI loader.
+ * Connection event handler loader.
  *
  * @author zhangliang
  */
-public final class GetConnectionEventHandlerSPILoader {
+public final class GetConnectionEventHandlerLoader {
 
-    private static final GetConnectionEventHandlerSPILoader INSTANCE = new GetConnectionEventHandlerSPILoader();
+    private static final GetConnectionEventHandlerLoader INSTANCE = new GetConnectionEventHandlerLoader();
 
     private final ServiceLoader<GetConnectionEventHandler> serviceLoader;
 
-    private GetConnectionEventHandlerSPILoader() {
+    private GetConnectionEventHandlerLoader() {
         serviceLoader = ServiceLoader.load(GetConnectionEventHandler.class);
     }
 
@@ -39,7 +39,7 @@ private GetConnectionEventHandlerSPILoader() {
      * 
      * @return instance
      */
-    public static GetConnectionEventHandlerSPILoader getInstance() {
+    public static GetConnectionEventHandlerLoader getInstance() {
         return INSTANCE;
     }
 

diff --git a/...nection/get/GetConnectionFinishEvent.java → ...nection/get/GetConnectionFinishEvent.java b/...nection/get/GetConnectionFinishEvent.java → ...nection/get/GetConnectionFinishEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.get;
+package io.shardingsphere.core.spi.event.connection.get;
 
-import io.shardingsphere.core.spi.ShardingFinishEvent;
+import io.shardingsphere.core.spi.event.ShardingFinishEvent;
 import io.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...nnection/get/GetConnectionStartEvent.java → ...nnection/get/GetConnectionStartEvent.java b/...nnection/get/GetConnectionStartEvent.java → ...nnection/get/GetConnectionStartEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.connection.get;
+package io.shardingsphere.core.spi.event.connection.get;
 
-import io.shardingsphere.core.spi.ShardingStartEvent;
+import io.shardingsphere.core.spi.event.ShardingStartEvent;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/...pi/executor/SQLExecutionEventHandler.java → ...nt/executor/SQLExecutionEventHandler.java b/...pi/executor/SQLExecutionEventHandler.java → ...nt/executor/SQLExecutionEventHandler.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.executor;
+package io.shardingsphere.core.spi.event.executor;
 
-import io.shardingsphere.core.spi.ShardingEventHandler;
+import io.shardingsphere.core.spi.event.ShardingEventHandler;
 
 /**
  * SQL Execution event handler.

diff --git a/...or/SQLExecutionEventHandlerSPILoader.java → ...cutor/SQLExecutionEventHandlerLoader.java b/...or/SQLExecutionEventHandlerSPILoader.java → ...cutor/SQLExecutionEventHandlerLoader.java
@@ -15,22 +15,22 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.executor;
+package io.shardingsphere.core.spi.event.executor;
 
 import java.util.ServiceLoader;
 
 /**
- * SQL Execution event handler SPI loader.
+ * SQL Execution event handler loader.
  *
  * @author zhangliang
  */
-public final class SQLExecutionEventHandlerSPILoader {
+public final class SQLExecutionEventHandlerLoader {
 
-    private static final SQLExecutionEventHandlerSPILoader INSTANCE = new SQLExecutionEventHandlerSPILoader();
+    private static final SQLExecutionEventHandlerLoader INSTANCE = new SQLExecutionEventHandlerLoader();
 
     private final ServiceLoader<SQLExecutionEventHandler> serviceLoader;
 
-    private SQLExecutionEventHandlerSPILoader() {
+    private SQLExecutionEventHandlerLoader() {
         serviceLoader = ServiceLoader.load(SQLExecutionEventHandler.class);
     }
 
@@ -39,7 +39,7 @@ private SQLExecutionEventHandlerSPILoader() {
      * 
      * @return instance
      */
-    public static SQLExecutionEventHandlerSPILoader getInstance() {
+    public static SQLExecutionEventHandlerLoader getInstance() {
         return INSTANCE;
     }
 

diff --git a/...spi/executor/SQLExecutionFinishEvent.java → ...ent/executor/SQLExecutionFinishEvent.java b/...spi/executor/SQLExecutionFinishEvent.java → ...ent/executor/SQLExecutionFinishEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.executor;
+package io.shardingsphere.core.spi.event.executor;
 
-import io.shardingsphere.core.spi.ShardingFinishEvent;
+import io.shardingsphere.core.spi.event.ShardingFinishEvent;
 
 /**
  * SQL execution finish event.

diff --git a/.../spi/executor/SQLExecutionStartEvent.java → ...vent/executor/SQLExecutionStartEvent.java b/.../spi/executor/SQLExecutionStartEvent.java → ...vent/executor/SQLExecutionStartEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.executor;
+package io.shardingsphere.core.spi.event.executor;
 
-import io.shardingsphere.core.spi.ShardingStartEvent;
+import io.shardingsphere.core.spi.event.ShardingStartEvent;
 import io.shardingsphere.core.metadata.datasource.DataSourceMetaData;
 import io.shardingsphere.core.routing.RouteUnit;
 import lombok.Getter;

diff --git a/...core/spi/parsing/ParsingEventHandler.java → ...pi/event/parsing/ParsingEventHandler.java b/...core/spi/parsing/ParsingEventHandler.java → ...pi/event/parsing/ParsingEventHandler.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.parsing;
+package io.shardingsphere.core.spi.event.parsing;
 
-import io.shardingsphere.core.spi.ShardingEventHandler;
+import io.shardingsphere.core.spi.event.ShardingEventHandler;
 
 /**
  * Parsing event handler.

diff --git a/...parsing/ParsingEventHandlerSPILoader.java → ...nt/parsing/ParsingEventHandlerLoader.java b/...parsing/ParsingEventHandlerSPILoader.java → ...nt/parsing/ParsingEventHandlerLoader.java
@@ -15,22 +15,22 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.parsing;
+package io.shardingsphere.core.spi.event.parsing;
 
 import java.util.ServiceLoader;
 
 /**
- * Parsing event handler SPI loader.
+ * Parsing event handler loader.
  *
  * @author zhangliang
  */
-public final class ParsingEventHandlerSPILoader {
+public final class ParsingEventHandlerLoader {
 
-    private static final ParsingEventHandlerSPILoader INSTANCE = new ParsingEventHandlerSPILoader();
+    private static final ParsingEventHandlerLoader INSTANCE = new ParsingEventHandlerLoader();
 
     private final ServiceLoader<ParsingEventHandler> serviceLoader;
 
-    private ParsingEventHandlerSPILoader() {
+    private ParsingEventHandlerLoader() {
         serviceLoader = ServiceLoader.load(ParsingEventHandler.class);
     }
 
@@ -39,7 +39,7 @@ private ParsingEventHandlerSPILoader() {
      * 
      * @return instance
      */
-    public static ParsingEventHandlerSPILoader getInstance() {
+    public static ParsingEventHandlerLoader getInstance() {
         return INSTANCE;
     }
 

diff --git a/.../core/spi/parsing/ParsingFinishEvent.java → ...spi/event/parsing/ParsingFinishEvent.java b/.../core/spi/parsing/ParsingFinishEvent.java → ...spi/event/parsing/ParsingFinishEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.parsing;
+package io.shardingsphere.core.spi.event.parsing;
 
-import io.shardingsphere.core.spi.ShardingFinishEvent;
+import io.shardingsphere.core.spi.event.ShardingFinishEvent;
 
 /**
  * Parsing finish event.

diff --git a/...e/core/spi/parsing/ParsingStartEvent.java → .../spi/event/parsing/ParsingStartEvent.java b/...e/core/spi/parsing/ParsingStartEvent.java → .../spi/event/parsing/ParsingStartEvent.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi.parsing;
+package io.shardingsphere.core.spi.event.parsing;
 
-import io.shardingsphere.core.spi.ShardingStartEvent;
+import io.shardingsphere.core.spi.event.ShardingStartEvent;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      * </p>
      */
-    package io.shardingsphere.core.spi;
+    package io.shardingsphere.core.spi.event;
     /**
      * Sharding event handler.
@@ Expand Down @@