From 894ea65a35e27c6d3daff305bc6abb7e8a4ef62e Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Fri, 3 Feb 2023 22:10:42 +0800
Subject: [PATCH] Filter.isNonBlocking

---
 .../org/redkale/annotation/NonBlocking.java    |  2 +-
 .../org/redkale/net/DispatcherServlet.java     | 18 +-----------------
 src/main/java/org/redkale/net/Filter.java      |  8 ++++++--
 src/main/java/org/redkale/net/Response.java    |  7 +++++++
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/redkale/annotation/NonBlocking.java b/src/main/java/org/redkale/annotation/NonBlocking.java
index 2fdf29dc3..84ccd92da 100644
--- a/src/main/java/org/redkale/annotation/NonBlocking.java
+++ b/src/main/java/org/redkale/annotation/NonBlocking.java
@@ -6,7 +6,7 @@ package org.redkale.annotation;
 import java.lang.annotation.*;
 
 /**
- * 非阻塞模式标记， 标记在Service类和方法、Filter类、HttpServlet类上  <br>
+ * 非阻塞模式标记， 标记在Service类和方法、HttpServlet类上  <br>
  * 一般情况下，没有显注此注解的方法视为阻塞时， 以下两种情况除外:  <br>
  * 1、返回类型是CompletableFuture <br>
  * 2、返回类型是void且参数存在CompletionHandler类型 <br>
diff --git a/src/main/java/org/redkale/net/DispatcherServlet.java b/src/main/java/org/redkale/net/DispatcherServlet.java
index cc66d8c2c..e21623de8 100644
--- a/src/main/java/org/redkale/net/DispatcherServlet.java
+++ b/src/main/java/org/redkale/net/DispatcherServlet.java
@@ -12,7 +12,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.stream.Stream;
-import org.redkale.annotation.NonBlocking;
 import org.redkale.boot.Application;
 import org.redkale.util.*;
 
@@ -45,8 +44,6 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
 
     private Map<K, S> mappings = new HashMap<>();
 
-    private volatile boolean allFilterAsync = true;
-
     private final List<Filter<C, R, P>> filters = new ArrayList<>();
 
     protected final ReentrantLock filtersLock = new ReentrantLock();
@@ -210,18 +207,12 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
         filtersLock.lock();
         try {
             this.filters.add(filter);
-            this.allFilterAsync = this.allFilterAsync && isNonBlocking(filter);
             Collections.sort(this.filters);
         } finally {
             filtersLock.unlock();
         }
     }
 
-    private boolean isNonBlocking(Filter filter) {
-        NonBlocking a = filter.getClass().getAnnotation(NonBlocking.class);
-        return a != null && a.value();
-    }
-
     public <T extends Filter<C, R, P>> T removeFilter(Class<T> filterClass) {
         return removeFilter(f -> filterClass.equals(f.getClass()));
     }
@@ -275,14 +266,6 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
                 }
                 filter._next = null;
                 this.filters.remove(filter);
-                boolean async = true;
-                for (Filter f : filters) {
-                    async = async && isNonBlocking(filter);
-                    if (!async) {
-                        break;
-                    }
-                }
-                this.allFilterAsync = async;
             }
             return (T) filter;
         } finally {
@@ -304,6 +287,7 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
             request.prepare();
             response.filter = this.headFilter;
             response.servlet = this;
+            response.inNonBlocking = true;
             response.nextEvent();
         } catch (Throwable t) {
             response.context.logger.log(Level.WARNING, "prepare servlet abort, force to close channel ", t);
diff --git a/src/main/java/org/redkale/net/Filter.java b/src/main/java/org/redkale/net/Filter.java
index dbe9ce6b2..72c2f5eda 100644
--- a/src/main/java/org/redkale/net/Filter.java
+++ b/src/main/java/org/redkale/net/Filter.java
@@ -7,7 +7,7 @@ package org.redkale.net;
 
 import java.io.IOException;
 import org.redkale.annotation.Priority;
-import org.redkale.util.*;
+import org.redkale.util.AnyValue;
 
 /**
  * 协议拦截器类, 类似JavaEE中的javax.servlet.Filter <br>
@@ -33,12 +33,16 @@ public abstract class Filter<C extends Context, R extends Request<C>, P extends
 
     public abstract void doFilter(R request, P response) throws IOException;
 
+    public abstract boolean isNonBlocking();
+
     public void destroy(C context, AnyValue config) {
     }
 
     @Override
     public int compareTo(Object o) {
-        if (!(o instanceof Filter)) return 1;
+        if (!(o instanceof Filter)) {
+            return 1;
+        }
         Priority p1 = this.getClass().getAnnotation(Priority.class);
         Priority p2 = o.getClass().getAnnotation(Priority.class);
         return (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value());
diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java
index c3ce05eab..84ef082df 100644
--- a/src/main/java/org/redkale/net/Response.java
+++ b/src/main/java/org/redkale/net/Response.java
@@ -39,6 +39,8 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     private volatile boolean inited = true;
 
+    protected boolean inNonBlocking = true;
+
     protected Object output; //输出的结果对象
 
     protected BiConsumer<R, Response<C, R>> recycleListener;
@@ -127,6 +129,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected void prepare() {
         inited = true;
+        inNonBlocking = true;
         request.prepare();
     }
 
@@ -151,6 +154,10 @@ public abstract class Response<C extends Context, R extends Request<C>> {
         return true;
     }
 
+    protected boolean inNonBlocking() {
+        return inNonBlocking;
+    }
+
     protected void refuseAlive() {
         this.request.keepAlive = false;
     }