From 4e675d007eb79b4f5e07f609a67e2067d9e4729b Mon Sep 17 00:00:00 2001 From: Redkale Date: Fri, 18 Nov 2022 15:23:53 +0800 Subject: [PATCH] =?UTF-8?q?redkale.convert.tiny=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E7=94=B1true=E6=94=B9=E6=88=90false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/META-INF/application-template.xml | 2 +- src/main/java/org/redkale/boot/Application.java | 2 +- src/main/java/org/redkale/convert/ConvertFactory.java | 2 +- src/main/java/org/redkale/convert/bson/BsonFactory.java | 4 ++-- src/main/java/org/redkale/convert/json/JsonFactory.java | 4 ++-- src/main/java/org/redkale/net/Filter.java | 4 +++- src/main/java/org/redkale/util/Utility.java | 8 ++++++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml index 28e0e16ae..c44eeb487 100644 --- a/src/main/java/META-INF/application-template.xml +++ b/src/main/java/META-INF/application-template.xml @@ -130,7 +130,7 @@ System.setProperty("redkale.net.transport.poolmaxconns", "100"); System.setProperty("redkale.net.transport.pinginterval", "30"); System.setProperty("redkale.net.transport.checkinterval", "30"); - System.setProperty("redkale.convert.tiny", "true"); + System.setProperty("redkale.convert.tiny", "false"); System.setProperty("redkale.convert.pool.size", "128"); System.setProperty("redkale.convert.writer.buffer.defsize", "4096"); diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index c11d67ab2..ab805f905 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -665,7 +665,7 @@ public final class Application { System.setProperty("redkale.net.transport.poolmaxconns", "100"); System.setProperty("redkale.net.transport.pinginterval", "30"); System.setProperty("redkale.net.transport.checkinterval", "30"); - System.setProperty("redkale.convert.tiny", "true"); + System.setProperty("redkale.convert.tiny", "false"); System.setProperty("redkale.convert.pool.size", "128"); System.setProperty("redkale.convert.writer.buffer.defsize", "4096"); diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java index 4cd7b4b60..f3774447b 100644 --- a/src/main/java/org/redkale/convert/ConvertFactory.java +++ b/src/main/java/org/redkale/convert/ConvertFactory.java @@ -42,7 +42,7 @@ public abstract class ConvertFactory { protected Convert convert; - protected boolean tiny; //String类型值为""，Boolean类型值为false时是否需要输出， 默认为true + protected boolean tiny; //String类型值为""，Boolean类型值为false时是否需要输出， 默认为false private final Encodeable anyEncoder = new AnyEncoder(this); diff --git a/src/main/java/org/redkale/convert/bson/BsonFactory.java b/src/main/java/org/redkale/convert/bson/BsonFactory.java index 6b13638ae..a86f763cc 100644 --- a/src/main/java/org/redkale/convert/bson/BsonFactory.java +++ b/src/main/java/org/redkale/convert/bson/BsonFactory.java @@ -24,7 +24,7 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public final class BsonFactory extends ConvertFactory { - private static final BsonFactory instance = new BsonFactory(null, getSystemPropertyBoolean("redkale.convert.bson.tiny", "redkale.convert.tiny", true)); + private static final BsonFactory instance = new BsonFactory(null, getSystemPropertyBoolean("redkale.convert.bson.tiny", "redkale.convert.tiny", false)); static final Decodeable objectDecoder = instance.loadDecoder(Object.class); @@ -73,7 +73,7 @@ public final class BsonFactory extends ConvertFactory { } public static BsonFactory create() { - return new BsonFactory(null, getSystemPropertyBoolean("redkale.convert.bson.tiny", "redkale.convert.tiny", true)); + return new BsonFactory(null, getSystemPropertyBoolean("redkale.convert.bson.tiny", "redkale.convert.tiny", false)); } @Override diff --git a/src/main/java/org/redkale/convert/json/JsonFactory.java b/src/main/java/org/redkale/convert/json/JsonFactory.java index 6b2ac8023..3b5b8f7b2 100644 --- a/src/main/java/org/redkale/convert/json/JsonFactory.java +++ b/src/main/java/org/redkale/convert/json/JsonFactory.java @@ -24,7 +24,7 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public final class JsonFactory extends ConvertFactory { - private static final JsonFactory instance = new JsonFactory(null, getSystemPropertyBoolean("redkale.convert.json.tiny", "redkale.convert.tiny", true)); + private static final JsonFactory instance = new JsonFactory(null, getSystemPropertyBoolean("redkale.convert.json.tiny", "redkale.convert.tiny", false)); static { instance.register(Serializable.class, instance.loadEncoder(Object.class)); @@ -65,7 +65,7 @@ public final class JsonFactory extends ConvertFactory { } public static JsonFactory create() { - return new JsonFactory(null, getSystemPropertyBoolean("redkale.convert.json.tiny", "redkale.convert.tiny", true)); + return new JsonFactory(null, getSystemPropertyBoolean("redkale.convert.json.tiny", "redkale.convert.tiny", false)); } @Override diff --git a/src/main/java/org/redkale/net/Filter.java b/src/main/java/org/redkale/net/Filter.java index 6b145f7d4..562ca4251 100644 --- a/src/main/java/org/redkale/net/Filter.java +++ b/src/main/java/org/redkale/net/Filter.java @@ -10,7 +10,9 @@ import javax.annotation.Priority; import org.redkale.util.*; /** - * 协议拦截器类 + * 协议拦截器类, 类似JavaEE中的javax.servlet.Filter
+ * javax.servlet.Filter方法doFilter是同步操作，此Filter.doFilter则是异步操作，方法return前需要调用Response.nextEvent()方可执行下一个Filter
+ * 通过给Filter标记注解@Priority来确定执行的顺序, Priority.value值越大越先执行 * *

* 详情见: https://redkale.org diff --git a/src/main/java/org/redkale/util/Utility.java b/src/main/java/org/redkale/util/Utility.java index 32f61a758..0c54e1cf4 100644 --- a/src/main/java/org/redkale/util/Utility.java +++ b/src/main/java/org/redkale/util/Utility.java @@ -244,6 +244,14 @@ public final class Utility { } } + public static CompletableFuture orTimeout(CompletableFuture future, Duration timeout) { + return future.orTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS); + } + + public static CompletableFuture completeOnTimeout(CompletableFuture future, T value, Duration timeout) { + return future.completeOnTimeout(value, timeout.toMillis(), TimeUnit.MILLISECONDS); + } + public static CompletableFuture orTimeout(CompletableFuture future, long timeout, TimeUnit unit) { return future.orTimeout(timeout, unit); }