for #1172, load spi for every new spi loader instance

apache · Sep 26, 2018 · bc7bea0 · bc7bea0
1 parent 93f8b6e
commit bc7bea0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SPISQLExecutionHook.java b/sharding-core/src/main/java/io/shardingsphere/core/spi/executor/SPISQLExecutionHook.java
@@ -29,25 +29,25 @@
  */
 public final class SPISQLExecutionHook implements SQLExecutionHook {
 
-    private static final ServiceLoader<SQLExecutionHook> SERVICE_LOADER = ServiceLoader.load(SQLExecutionHook.class);
+    private final ServiceLoader<SQLExecutionHook> serviceLoader = ServiceLoader.load(SQLExecutionHook.class);
 
     @Override
-    public synchronized void start(final RouteUnit routeUnit, final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread) {
-        for (SQLExecutionHook each : SERVICE_LOADER) {
+    public void start(final RouteUnit routeUnit, final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread) {
+        for (SQLExecutionHook each : serviceLoader) {
             each.start(routeUnit, dataSourceMetaData, isTrunkThread);
         }
     }
 
     @Override
-    public synchronized void finishSuccess() {
-        for (SQLExecutionHook each : SERVICE_LOADER) {
+    public void finishSuccess() {
+        for (SQLExecutionHook each : serviceLoader) {
             each.finishSuccess();
         }
     }
 
     @Override
-    public synchronized void finishFailure(final Exception cause) {
-        for (SQLExecutionHook each : SERVICE_LOADER) {
+    public void finishFailure(final Exception cause) {
+        for (SQLExecutionHook each : serviceLoader) {
             each.finishFailure(cause);
         }
     }

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/SPIParsingHook.java b/sharding-core/src/main/java/io/shardingsphere/core/spi/parsing/SPIParsingHook.java
@@ -26,25 +26,25 @@
  */
 public final class SPIParsingHook implements ParsingHook {
 
-    private static final ServiceLoader<ParsingHook> SERVICE_LOADER = ServiceLoader.load(ParsingHook.class);
+    private final ServiceLoader<ParsingHook> serviceLoader = ServiceLoader.load(ParsingHook.class);
 
     @Override
     public void start(final String sql) {
-        for (ParsingHook each : SERVICE_LOADER) {
+        for (ParsingHook each : serviceLoader) {
             each.start(sql);
         }
     }
 
     @Override
     public void finishSuccess() {
-        for (ParsingHook each : SERVICE_LOADER) {
+        for (ParsingHook each : serviceLoader) {
             each.finishSuccess();
         }
     }
 
     @Override
     public void finishFailure(final Exception cause) {
-        for (ParsingHook each : SERVICE_LOADER) {
+        for (ParsingHook each : serviceLoader) {
             each.finishFailure(cause);
         }
     }

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/spi/root/SPIRootInvokeHook.java b/sharding-core/src/main/java/io/shardingsphere/core/spi/root/SPIRootInvokeHook.java
@@ -26,18 +26,18 @@
  */
 public final class SPIRootInvokeHook implements RootInvokeHook {
 
-    private static final ServiceLoader<RootInvokeHook> SERVICE_LOADER = ServiceLoader.load(RootInvokeHook.class);
+    private final ServiceLoader<RootInvokeHook> serviceLoader = ServiceLoader.load(RootInvokeHook.class);
 
     @Override
     public void start() {
-        for (RootInvokeHook each : SERVICE_LOADER) {
+        for (RootInvokeHook each : serviceLoader) {
             each.start();
         }
     }
 
     @Override
     public void finish(final int connectionCount) {
-        for (RootInvokeHook each : SERVICE_LOADER) {
+        for (RootInvokeHook each : serviceLoader) {
             each.finish(connectionCount);
         }
     }

diff --git a/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
@@ -66,11 +66,11 @@ private String toString(final List<List<Object>> parameterSets) {
     }
 
     private List<String> toStringList(final List<List<Object>> parameterSets) {
-        List<String> parameterString = new LinkedList<>();
+        List<String> result = new LinkedList<>();
         for (List<Object> each : parameterSets) {
-            parameterString.add(String.format("[%s]", Joiner.on(", ").join(each)));
+            result.add(String.format("[%s]", Joiner.on(", ").join(each)));
         }
-        return parameterString;
+        return result;
     }
 
     @Override