From e2b6e4b65eb720699b8a009302091d0a3f8bc6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Wed, 2 Feb 2022 12:59:55 +0100 Subject: [PATCH] update to netty 4.1.73, tcnative 2.0.48, cosmetic changes --- gradle.properties | 6 +++--- netty-http-server-api/src/main/java/module-info.java | 1 + .../src/main/java/org/xbib/netty/http/server/Server.java | 2 +- .../org/xbib/netty/http/server/endpoint/HttpEndpoint.java | 3 ++- .../netty/http/server/endpoint/HttpEndpointResolver.java | 2 +- .../netty/http/server/endpoint/service/MethodService.java | 2 +- .../netty/http/server/endpoint/service/ResourceService.java | 1 - .../server/test/hacks/MultithreadedCleartextHttp2Test.java | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6937a4c..d351cd1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ group = org.xbib name = netty-http -version = 4.1.72.1 +version = 4.1.73.0 org.gradle.warning.mode = ALL gradle.wrapper.version = 7.3.2 -netty.version = 4.1.72.Final -tcnative.version = 2.0.46.Final +netty.version = 4.1.73.Final +tcnative.version = 2.0.48.Final bouncycastle.version = 1.69 conscrypt.version = 2.5.2 javassist.version = 3.28.0-GA diff --git a/netty-http-server-api/src/main/java/module-info.java b/netty-http-server-api/src/main/java/module-info.java index 0b3919b..1a84cb3 100644 --- a/netty-http-server-api/src/main/java/module-info.java +++ b/netty-http-server-api/src/main/java/module-info.java @@ -3,6 +3,7 @@ module org.xbib.netty.http.server.api { requires org.xbib.netty.http.common; requires org.xbib.net.url; requires io.netty.buffer; + requires io.netty.common; requires io.netty.handler; requires io.netty.transport; requires io.netty.codec.http; diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/Server.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/Server.java index 216fd78..f971da1 100644 --- a/netty-http-server/src/main/java/org/xbib/netty/http/server/Server.java +++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/Server.java @@ -464,7 +464,7 @@ public final class Server implements AutoCloseable { thread.setDaemon(true); return thread; } - }; + } public static class BlockingThreadPoolExecutor extends ThreadPoolExecutor { diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpoint.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpoint.java index 70be6f3..9d467ed 100644 --- a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpoint.java +++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpoint.java @@ -38,7 +38,8 @@ public class HttpEndpoint implements Endpoint { private final List afterFilters; - private HttpEndpoint(String prefix, String path, + private HttpEndpoint(String prefix, + String path, EnumSet methods, List contentTypes, List beforeFilters, diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpointResolver.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpointResolver.java index 34e7456..677f8a5 100644 --- a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpointResolver.java +++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpointResolver.java @@ -33,7 +33,7 @@ public class HttpEndpointResolver implements EndpointResolver { /** * Find matching endpoints for a server request. - * @return a + * @return a sorted list of matching endpoints */ @Override public List matchingEndpointsFor(String path, HttpMethod method, String contentType) { diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/MethodService.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/MethodService.java index 39ccb12..a20b09f 100644 --- a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/MethodService.java +++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/MethodService.java @@ -9,7 +9,7 @@ import java.io.IOException; import java.lang.reflect.Method; /** - * The {@code MethodHandler} invokes g a handler method on a specified object. + * The {@code MethodHandler} invokes a handler method on a specified object. * The method must have the same signature and contract as * {@link Filter#handle}, but can have an arbitrary name. */ diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/ResourceService.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/ResourceService.java index 9b6b638..6f078d0 100644 --- a/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/ResourceService.java +++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/ResourceService.java @@ -8,7 +8,6 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.stream.ChunkedNioStream; import org.xbib.netty.http.common.util.DateTimeUtil; import org.xbib.netty.http.server.api.Filter; -import org.xbib.netty.http.server.api.FilterConfig; import org.xbib.netty.http.server.api.Resource; import org.xbib.netty.http.server.api.ServerRequest; import org.xbib.netty.http.server.api.ServerResponse; diff --git a/netty-http-server/src/test/java/org/xbib/netty/http/server/test/hacks/MultithreadedCleartextHttp2Test.java b/netty-http-server/src/test/java/org/xbib/netty/http/server/test/hacks/MultithreadedCleartextHttp2Test.java index 75773de..812a79f 100644 --- a/netty-http-server/src/test/java/org/xbib/netty/http/server/test/hacks/MultithreadedCleartextHttp2Test.java +++ b/netty-http-server/src/test/java/org/xbib/netty/http/server/test/hacks/MultithreadedCleartextHttp2Test.java @@ -130,7 +130,7 @@ class MultithreadedCleartextHttp2Test { .option(ChannelOption.SO_SNDBUF, 64 * 1024) .option(ChannelOption.SO_RCVBUF, 64 * 1024) .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5 * 1000) - .option(ChannelOption.WRITE_BUFFER_WATER_MARK,new WriteBufferWaterMark(32 * 1024, 64 * 1024)); + .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(32 * 1024, 64 * 1024)); Channel clientChannel = clientBootstrap.connect(inetSocketAddress).sync().channel(); clientLogger.log(level, "client connected, channel = " + clientChannel);