Merge pull request #84 from networknt/issue83

fixes #83 move the middleware skipping logic to MiddlewareRunnable

Author: stevehu

src/main/java/com/networknt/aws/lambda/handler/chain/PooledChainLinkExecutor.java

@@ -119,11 +119,6 @@ private ArrayList<ChainLinkWorker> createChainListWorkers(final ArrayList<Lambda
             LOG.debug("Creating thread for link '{}[{}]'.", chainLink.getClass().getName(), linkNumber++);
 
             if (chainLink.isEnabled()) {
-                // skip the request chain if the request is completed for all middleware that is not isResponseMiddleware().
-                if (exchange.isRequestComplete() && !chainLink.isResponseMiddleware()) {
-                    LOG.debug("Request is already completed, skipping middleware '{}'", chainLink.getClass().getName());
-                    continue;
-                }
                 final var loggingContext = new ChainLinkWorker.AuditThreadContext(MDC.getCopyOfContextMap());
                 final var runnable = new MiddlewareRunnable(chainLink, exchange, this.chainLinkCallback);
                 final var worker = new ChainLinkWorker(runnable, loggingContext);

src/main/java/com/networknt/aws/lambda/handler/middleware/MiddlewareRunnable.java

@@ -3,8 +3,12 @@
 import com.networknt.aws.lambda.LightLambdaExchange;
 import com.networknt.aws.lambda.handler.LambdaHandler;
 import com.networknt.aws.lambda.handler.chain.ChainLinkCallback;
+import com.networknt.aws.lambda.handler.middleware.router.LambdaRouterMiddleware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MiddlewareRunnable implements Runnable {
+    private static final Logger LOG = LoggerFactory.getLogger(MiddlewareRunnable.class);
 
     private final LambdaHandler middlewareHandler;
     private final LightLambdaExchange exchange;
@@ -19,7 +23,18 @@ public MiddlewareRunnable(LambdaHandler middlewareHandler, LightLambdaExchange e
 
     @Override
     public void run() {
+        if(LOG.isTraceEnabled()) LOG.trace("Executing middleware {} isResponseMiddleware {} isRequestComplete {}", this.middlewareHandler.getClass().getSimpleName(), this.middlewareHandler.isResponseMiddleware(), this.exchange.isRequestComplete());
         try {
+            if(!this.middlewareHandler.isResponseMiddleware() && this.exchange.isRequestComplete()) {
+                // skip the request chain if the request is completed for all request middleware.
+                if(LOG.isTraceEnabled()) LOG.trace("Skipping request middleware {} as request is already complete", this.middlewareHandler.getClass().getSimpleName());
+                return;
+            }
+            if(this.middlewareHandler.isResponseMiddleware() && this.exchange.isResponseComplete()) {
+                // skip the response chain if the response is completed for all response middleware.
+                if(LOG.isTraceEnabled()) LOG.trace("Skipping response middleware {} as response is already complete", this.middlewareHandler.getClass().getSimpleName());
+                return;
+            }
             var status = this.middlewareHandler.execute(this.exchange);
             this.callback.callback(this.exchange, status);