Merge pull request #21 from mercyblitz/dev

Refactor

Author: mercyblitz

microsphere-mybatis-core/src/main/java/io/microsphere/mybatis/executor/ExecutorFilterChain.java

@@ -18,7 +18,6 @@
 
 import io.microsphere.lang.function.ThrowableConsumer;
 import io.microsphere.lang.function.ThrowableFunction;
-import io.microsphere.logging.Logger;
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.executor.Executor;
@@ -38,7 +37,6 @@
 import java.util.Properties;
 import java.util.function.Function;
 
-import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.util.ArrayUtils.length;
 import static io.microsphere.util.Assert.assertNotEmpty;
 import static io.microsphere.util.Assert.assertNotNull;
@@ -53,8 +51,6 @@
  */
 public class ExecutorFilterChain {
 
-    private static final Logger logger = getLogger(ExecutorFilterChain.class);
-
     private final Executor executor;
 
     @Nullable
@@ -159,26 +155,16 @@ protected <R> R applySQL(ThrowableFunction<ExecutorFilter, R> filterFunction,
     protected <E extends Throwable, R> R process(ThrowableFunction<ExecutorFilter, R> filterFunction,
                                                  ThrowableFunction<Executor, R> executorFunction,
                                                  Function<Throwable, E> failureHandler) throws E {
-
-        if (position < size) {
-            ExecutorFilter filter = filters[position++];
-            try {
-                return filterFunction.apply(filter);
-            } catch (Throwable e) {
-                if (logger.isWarnEnabled()) {
-                    logger.warn("Failed to execute ExecutorFilter[ index : {} , instance : {}]", position, filter, e);
-                }
-            }
-        }
-
-        R result = null;
-
+        final R result;
         try {
-            result = executorFunction.apply(this.executor);
+            if (position < size) {
+                result = filterFunction.apply(filters[position++]);
+            } else {
+                result = executorFunction.apply(this.executor);
+            }
         } catch (Throwable failure) {
             throw failureHandler.apply(failure);
         }
-
         return result;
     }
 

microsphere-mybatis-core/src/test/java/io/microsphere/mybatis/plugin/InterceptingExecutorInterceptorTest.java

@@ -16,7 +16,6 @@
  */
 package io.microsphere.mybatis.plugin;
 
-import io.microsphere.mybatis.executor.ThrowingErrorExecutorFilter;
 import io.microsphere.mybatis.executor.LogggingExecutorInterceptor;
 import io.microsphere.mybatis.executor.LoggingExecutorFilter;
 import io.microsphere.mybatis.executor.TestExecutorFilter;
@@ -45,7 +44,7 @@ protected void customize(Configuration configuration) {
 
     private InterceptingExecutorInterceptor createInterceptingExecutorInterceptor() {
         InterceptingExecutorInterceptor interceptor = new InterceptingExecutorInterceptor(
-                of(new LoggingExecutorFilter(), new TestExecutorFilter(), new ThrowingErrorExecutorFilter()),
+                of(new LoggingExecutorFilter(), new TestExecutorFilter()),
                 new LogggingExecutorInterceptor(), new TestInterceptorContextExecutorInterceptor());
         Properties properties = new Properties();
         properties.setProperty(TEST_PROPERTY_KEY, this.getClass().getName());