增加NonBlocking
This commit is contained in:
@@ -1,23 +0,0 @@
|
||||
/*
|
||||
*
|
||||
*/
|
||||
package org.redkale.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* 异步模式标记。
|
||||
*
|
||||
* <p>
|
||||
* 详情见: https://redkale.org
|
||||
*
|
||||
* @author zhangjx
|
||||
*
|
||||
* @since 2.8.0
|
||||
*/
|
||||
@Target({ElementType.TYPE, ElementType.METHOD})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface Async {
|
||||
|
||||
boolean value() default true;
|
||||
}
|
||||
28
src/main/java/org/redkale/annotation/NonBlocking.java
Normal file
28
src/main/java/org/redkale/annotation/NonBlocking.java
Normal file
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
*
|
||||
*/
|
||||
package org.redkale.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* 非阻塞模式标记, 标记在Service类和方法、Filter类、HttpServlet类上 <br>
|
||||
* 一般情况下,没有显注此注解的方法视为阻塞时, 以下两种情况除外: <br>
|
||||
* 1、返回类型是CompletableFuture <br>
|
||||
* 2、返回类型是void且参数存在CompletionHandler类型 <br>
|
||||
* 阻塞模式的方法会在work线程池中运行, 非阻塞在IO线程中运行。
|
||||
*
|
||||
*
|
||||
* <p>
|
||||
* 详情见: https://redkale.org
|
||||
*
|
||||
* @author zhangjx
|
||||
*
|
||||
* @since 2.8.0
|
||||
*/
|
||||
@Target({ElementType.TYPE, ElementType.METHOD})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface NonBlocking {
|
||||
|
||||
boolean value() default true;
|
||||
}
|
||||
@@ -12,7 +12,7 @@ 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.Async;
|
||||
import org.redkale.annotation.NonBlocking;
|
||||
import org.redkale.boot.Application;
|
||||
import org.redkale.util.*;
|
||||
|
||||
@@ -210,15 +210,15 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
|
||||
filtersLock.lock();
|
||||
try {
|
||||
this.filters.add(filter);
|
||||
this.allFilterAsync = this.allFilterAsync && isAsync(filter);
|
||||
this.allFilterAsync = this.allFilterAsync && isNonBlocking(filter);
|
||||
Collections.sort(this.filters);
|
||||
} finally {
|
||||
filtersLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isAsync(Filter filter) {
|
||||
Async a = filter.getClass().getAnnotation(Async.class);
|
||||
private boolean isNonBlocking(Filter filter) {
|
||||
NonBlocking a = filter.getClass().getAnnotation(NonBlocking.class);
|
||||
return a != null && a.value();
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
|
||||
this.filters.remove(filter);
|
||||
boolean async = true;
|
||||
for (Filter f : filters) {
|
||||
async = async && isAsync(filter);
|
||||
async = async && isNonBlocking(filter);
|
||||
if (!async) {
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user