for #1172, move ot event to spi package

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

Hide file tree

Showing 43 changed files with 106 additions and 108 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.event.executor.SQLExecutionEventHandlerSPILoader;
-import io.shardingsphere.core.event.executor.SQLExecutionFinishEvent;
-import io.shardingsphere.core.event.executor.SQLExecutionStartEvent;
+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.executor.ShardingExecuteCallback;
 import io.shardingsphere.core.executor.ShardingGroupExecuteCallback;
 import io.shardingsphere.core.executor.StatementExecuteUnit;

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.event.parsing.ParsingEventHandlerSPILoader;
-import io.shardingsphere.core.event.parsing.ParsingFinishEvent;
-import io.shardingsphere.core.event.parsing.ParsingStartEvent;
+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.metadata.datasource.ShardingDataSourceMetaData;
 import io.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import io.shardingsphere.core.optimizer.OptimizeEngineFactory;
@@ -89,12 +89,11 @@ public SQLStatement parse(final String logicSQL, final boolean useCache) {
         ParsingFinishEvent finishEvent = new ParsingFinishEvent();
         try {
             SQLStatement sqlStatement = new SQLParsingEngine(databaseType, logicSQL, shardingRule, shardingTableMetaData).parse(useCache);
-            finishEvent.setExecuteSuccess();
             return sqlStatement;
             // CHECKSTYLE:OFF
         } catch (final Exception ex) {
             // CHECKSTYLE:ON
-            finishEvent.setExecuteFailure(ex);
+            finishEvent.setException(ex);
             throw ex;
         } finally {
             ParsingEventHandlerSPILoader.getInstance().handle(finishEvent);

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

diff --git a/...phere/core/event/ShardingFinishEvent.java → ...gsphere/core/spi/ShardingFinishEvent.java b/...phere/core/event/ShardingFinishEvent.java → ...gsphere/core/spi/ShardingFinishEvent.java
@@ -15,12 +15,19 @@
  * </p>
  */
 
-package io.shardingsphere.core.event;
+package io.shardingsphere.core.spi;
+
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Sharding finish event.
  *
  * @author zhangyonglun
  */
-public class ShardingFinishEvent extends ShardingEvent {
+@Getter
+@Setter
+public class ShardingFinishEvent {
+
+    private Exception exception;
 }
diff --git a/...sphere/core/event/ShardingStartEvent.java → ...ngsphere/core/spi/ShardingStartEvent.java b/...sphere/core/event/ShardingStartEvent.java → ...ngsphere/core/spi/ShardingStartEvent.java
@@ -15,12 +15,12 @@
  * </p>
  */
 
-package io.shardingsphere.core.event;
+package io.shardingsphere.core.spi;
 
 /**
  * Sharding start event.
  *
  * @author zhangyonglun
  */
-public class ShardingStartEvent extends ShardingEvent {
+public class ShardingStartEvent {
 }
diff --git a/...nnection/CloseConnectionEventHandler.java → ...on/close/CloseConnectionEventHandler.java b/...nnection/CloseConnectionEventHandler.java → ...on/close/CloseConnectionEventHandler.java
@@ -15,9 +15,9 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.connection;
+package io.shardingsphere.core.spi.connection.close;
 
-import io.shardingsphere.core.event.ShardingEventHandler;
+import io.shardingsphere.core.spi.ShardingEventHandler;
 
 /**
  * Connection event handler.

diff --git a/...CloseConnectionEventHandlerSPILoader.java → ...CloseConnectionEventHandlerSPILoader.java b/...CloseConnectionEventHandlerSPILoader.java → ...CloseConnectionEventHandlerSPILoader.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.connection;
+package io.shardingsphere.core.spi.connection.close;
 
 import java.util.ServiceLoader;
 

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

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

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

diff --git a/...n/GetConnectionEventHandlerSPILoader.java → ...t/GetConnectionEventHandlerSPILoader.java b/...n/GetConnectionEventHandlerSPILoader.java → ...t/GetConnectionEventHandlerSPILoader.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.connection;
+package io.shardingsphere.core.spi.connection.get;
 
 import java.util.ServiceLoader;
 

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

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

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

diff --git a/...or/SQLExecutionEventHandlerSPILoader.java → ...or/SQLExecutionEventHandlerSPILoader.java b/...or/SQLExecutionEventHandlerSPILoader.java → ...or/SQLExecutionEventHandlerSPILoader.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.executor;
+package io.shardingsphere.core.spi.executor;
 
 import java.util.ServiceLoader;
 

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

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

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

diff --git a/...parsing/ParsingEventHandlerSPILoader.java → ...parsing/ParsingEventHandlerSPILoader.java b/...parsing/ParsingEventHandlerSPILoader.java → ...parsing/ParsingEventHandlerSPILoader.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.parsing;
+package io.shardingsphere.core.spi.parsing;
 
 import java.util.ServiceLoader;
 

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

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

diff --git a/...ingsphere/core/spi/RootInvokeHandler.java → ...here/core/spi/root/RootInvokeHandler.java b/...ingsphere/core/spi/RootInvokeHandler.java → ...here/core/spi/root/RootInvokeHandler.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi;
+package io.shardingsphere.core.spi.root;
 
 /**
  * Root invoke handler.

diff --git a/.../core/spi/RootInvokeHandlerSPILoader.java → .../spi/root/RootInvokeHandlerSPILoader.java b/.../core/spi/RootInvokeHandlerSPILoader.java → .../spi/root/RootInvokeHandlerSPILoader.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.core.spi;
+package io.shardingsphere.core.spi.root;
 
 import java.util.ServiceLoader;
 

diff --git a/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java
@@ -25,20 +25,20 @@
 import io.shardingsphere.core.constant.transaction.TransactionOperationType;
 import io.shardingsphere.core.constant.transaction.TransactionType;
 import io.shardingsphere.core.event.ShardingEventBusInstance;
-import io.shardingsphere.core.event.connection.CloseConnectionEventHandlerSPILoader;
-import io.shardingsphere.core.event.connection.CloseConnectionFinishEvent;
-import io.shardingsphere.core.event.connection.CloseConnectionStartEvent;
-import io.shardingsphere.core.event.connection.GetConnectionEventHandlerSPILoader;
-import io.shardingsphere.core.event.connection.GetConnectionFinishEvent;
-import io.shardingsphere.core.event.connection.GetConnectionStartEvent;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionEventHandlerSPILoader;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionFinishEvent;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionStartEvent;
+import io.shardingsphere.core.spi.connection.get.GetConnectionEventHandlerSPILoader;
+import io.shardingsphere.core.spi.connection.get.GetConnectionFinishEvent;
+import io.shardingsphere.core.spi.connection.get.GetConnectionStartEvent;
 import io.shardingsphere.core.event.transaction.xa.XATransactionEvent;
 import io.shardingsphere.core.hint.HintManagerHolder;
 import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteCallback;
 import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteTemplate;
 import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationConnection;
 import io.shardingsphere.core.metadata.datasource.DataSourceMetaDataFactory;
 import io.shardingsphere.core.routing.router.masterslave.MasterVisitedManager;
-import io.shardingsphere.core.spi.RootInvokeHandlerSPILoader;
+import io.shardingsphere.core.spi.root.RootInvokeHandlerSPILoader;
 import io.shardingsphere.core.transaction.TransactionTypeHolder;
 import lombok.RequiredArgsConstructor;
 
@@ -124,7 +124,8 @@ public final List<Connection> getConnections(final ConnectionMode connectionMode
                 cachedConnections.putAll(dataSourceName, result);
             }
         }
-        handleGetConnectionEvent(result);
+        GetConnectionEventHandlerSPILoader.getInstance().handle(
+                new GetConnectionFinishEvent(connections.size(), DataSourceMetaDataFactory.newInstance(databaseType, result.get(0).getMetaData().getURL())));
         return result;
     }
 
@@ -155,12 +156,6 @@ private Connection createConnection(final DataSource dataSource) throws SQLExcep
         return result;
     }
 
-    private void handleGetConnectionEvent(final List<Connection> connections) throws SQLException {
-        GetConnectionFinishEvent finishEvent = new GetConnectionFinishEvent(connections.size(), DataSourceMetaDataFactory.newInstance(databaseType, connections.get(0).getMetaData().getURL()));
-        finishEvent.setExecuteSuccess();
-        GetConnectionEventHandlerSPILoader.getInstance().handle(finishEvent);
-    }
-
     protected abstract Map<String, DataSource> getDataSourceMap();
 
     protected final void removeCache(final Connection connection) {
@@ -238,11 +233,10 @@ public void execute(final Entry<String, Connection> cachedConnectionsEntrySet) t
                 CloseConnectionFinishEvent finishEvent = new CloseConnectionFinishEvent();
                 try {
                     connection.close();
-                    finishEvent.setExecuteSuccess();
                     // CHECKSTYLE:OFF
                 } catch (final Exception ex) {
                     // CHECKSTYLE:ON
-                    finishEvent.setExecuteFailure(ex);
+                    finishEvent.setException(ex);
                     throw ex;
                 } finally {
                     CloseConnectionEventHandlerSPILoader.getInstance().handle(finishEvent);

diff --git a/...ng-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnection.java b/...ng-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnection.java
@@ -22,7 +22,7 @@
 import io.shardingsphere.core.jdbc.core.statement.ShardingPreparedStatement;
 import io.shardingsphere.core.jdbc.core.statement.ShardingStatement;
 import io.shardingsphere.core.rule.MasterSlaveRule;
-import io.shardingsphere.core.spi.RootInvokeHandlerSPILoader;
+import io.shardingsphere.core.spi.root.RootInvokeHandlerSPILoader;
 import lombok.Getter;
 
 import javax.sql.DataSource;

diff --git a/...g-opentracing/src/main/java/io/shardingsphere/opentracing/handler/OpenTracingHandler.java b/...g-opentracing/src/main/java/io/shardingsphere/opentracing/handler/OpenTracingHandler.java
@@ -20,9 +20,9 @@
 import io.opentracing.Span;
 import io.opentracing.Tracer.SpanBuilder;
 import io.opentracing.tag.Tags;
-import io.shardingsphere.core.event.ShardingEventHandler;
-import io.shardingsphere.core.event.ShardingFinishEvent;
-import io.shardingsphere.core.event.ShardingStartEvent;
+import io.shardingsphere.core.spi.ShardingEventHandler;
+import io.shardingsphere.core.spi.ShardingFinishEvent;
+import io.shardingsphere.core.spi.ShardingStartEvent;
 import io.shardingsphere.opentracing.ShardingTracer;
 import io.shardingsphere.opentracing.constant.ShardingErrorLogTags;
 import io.shardingsphere.opentracing.constant.ShardingTags;

diff --git a/...shardingsphere/opentracing/handler/connection/OpenTracingCloseConnectionEventHandler.java b/...shardingsphere/opentracing/handler/connection/OpenTracingCloseConnectionEventHandler.java
@@ -20,9 +20,9 @@
 import io.opentracing.Span;
 import io.opentracing.Tracer.SpanBuilder;
 import io.opentracing.tag.Tags;
-import io.shardingsphere.core.event.connection.CloseConnectionEventHandler;
-import io.shardingsphere.core.event.connection.CloseConnectionFinishEvent;
-import io.shardingsphere.core.event.connection.CloseConnectionStartEvent;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionEventHandler;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionFinishEvent;
+import io.shardingsphere.core.spi.connection.close.CloseConnectionStartEvent;
 import io.shardingsphere.opentracing.constant.ShardingTags;
 import io.shardingsphere.opentracing.handler.OpenTracingHandler;
 

diff --git a/...o/shardingsphere/opentracing/handler/connection/OpenTracingGetConnectionEventHandler.java b/...o/shardingsphere/opentracing/handler/connection/OpenTracingGetConnectionEventHandler.java
@@ -20,9 +20,9 @@
 import io.opentracing.Span;
 import io.opentracing.Tracer.SpanBuilder;
 import io.opentracing.tag.Tags;
-import io.shardingsphere.core.event.connection.GetConnectionEventHandler;
-import io.shardingsphere.core.event.connection.GetConnectionFinishEvent;
-import io.shardingsphere.core.event.connection.GetConnectionStartEvent;
+import io.shardingsphere.core.spi.connection.get.GetConnectionEventHandler;
+import io.shardingsphere.core.spi.connection.get.GetConnectionFinishEvent;
+import io.shardingsphere.core.spi.connection.get.GetConnectionStartEvent;
 import io.shardingsphere.opentracing.constant.ShardingTags;
 import io.shardingsphere.opentracing.handler.OpenTracingHandler;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      * </p>
      */
-    package io.shardingsphere.core.event;
+    package io.shardingsphere.core.spi;
     /**
      * Sharding event handler.
@@ Expand Down @@