joerg/netty-http
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to netty 4.1.73, tcnative 2.0.48, cosmetic changes

Browse source
This commit is contained in:
Jörg Prante 2022-02-02 12:59:55 +01:00
parent 2f99ce39c3
commit e2b6e4b65e
8 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gradle.properties
View file

@ -1,11 +1,11 @@
group = org.xbib group = org.xbib
name = netty-http name = netty-http
version = 4.1.72.1 version = 4.1.73.0
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL
gradle.wrapper.version = 7.3.2 gradle.wrapper.version = 7.3.2
netty.version = 4.1.72.Final netty.version = 4.1.73.Final
tcnative.version = 2.0.46.Final tcnative.version = 2.0.48.Final
bouncycastle.version = 1.69 bouncycastle.version = 1.69
conscrypt.version = 2.5.2 conscrypt.version = 2.5.2
javassist.version = 3.28.0-GA javassist.version = 3.28.0-GA

1
netty-http-server-api/src/main/java/module-info.java
View file

@ -3,6 +3,7 @@ module org.xbib.netty.http.server.api {
requires org.xbib.netty.http.common; requires org.xbib.netty.http.common;
requires org.xbib.net.url; requires org.xbib.net.url;
requires io.netty.buffer; requires io.netty.buffer;
requires io.netty.common;
requires io.netty.handler; requires io.netty.handler;
requires io.netty.transport; requires io.netty.transport;
requires io.netty.codec.http; requires io.netty.codec.http;

2
netty-http-server/src/main/java/org/xbib/netty/http/server/Server.java
View file

@ -464,7 +464,7 @@ public final class Server implements AutoCloseable {
thread.setDaemon(true); thread.setDaemon(true);
return thread; return thread;
} }
}; }
public static class BlockingThreadPoolExecutor extends ThreadPoolExecutor { public static class BlockingThreadPoolExecutor extends ThreadPoolExecutor {

3
netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpoint.java
View file

@ -38,7 +38,8 @@ public class HttpEndpoint implements Endpoint<HttpEndpointDescriptor> {
private final List<Filter> afterFilters; private final List<Filter> afterFilters;
private HttpEndpoint(String prefix, String path, private HttpEndpoint(String prefix,
String path,
EnumSet<HttpMethod> methods, EnumSet<HttpMethod> methods,
List<String> contentTypes, List<String> contentTypes,
List<Filter> beforeFilters, List<Filter> beforeFilters,

2
netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/HttpEndpointResolver.java
View file

@ -33,7 +33,7 @@ public class HttpEndpointResolver implements EndpointResolver<HttpEndpoint> {
/** /**
* Find matching endpoints for a server request. * Find matching endpoints for a server request.
* @return a * @return a sorted list of matching endpoints
*/ */
@Override @Override
public List<HttpEndpoint> matchingEndpointsFor(String path, HttpMethod method, String contentType) { public List<HttpEndpoint> matchingEndpointsFor(String path, HttpMethod method, String contentType) {

2
netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/MethodService.java
View file

@ -9,7 +9,7 @@ import java.io.IOException;
import java.lang.reflect.Method; 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 * The method must have the same signature and contract as
* {@link Filter#handle}, but can have an arbitrary name. * {@link Filter#handle}, but can have an arbitrary name.
*/ */

1
netty-http-server/src/main/java/org/xbib/netty/http/server/endpoint/service/ResourceService.java
View file

@ -8,7 +8,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.stream.ChunkedNioStream; import io.netty.handler.stream.ChunkedNioStream;
import org.xbib.netty.http.common.util.DateTimeUtil; import org.xbib.netty.http.common.util.DateTimeUtil;
import org.xbib.netty.http.server.api.Filter; 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.Resource;
import org.xbib.netty.http.server.api.ServerRequest; import org.xbib.netty.http.server.api.ServerRequest;
import org.xbib.netty.http.server.api.ServerResponse; import org.xbib.netty.http.server.api.ServerResponse;

2
netty-http-server/src/test/java/org/xbib/netty/http/server/test/hacks/MultithreadedCleartextHttp2Test.java
View file

@ -130,7 +130,7 @@ class MultithreadedCleartextHttp2Test {
.option(ChannelOption.SO_SNDBUF, 64 * 1024) .option(ChannelOption.SO_SNDBUF, 64 * 1024)
.option(ChannelOption.SO_RCVBUF, 64 * 1024) .option(ChannelOption.SO_RCVBUF, 64 * 1024)
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5 * 1000) .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(); Channel clientChannel = clientBootstrap.connect(inetSocketAddress).sync().channel();
clientLogger.log(level, "client connected, channel = " + clientChannel); clientLogger.log(level, "client connected, channel = " + clientChannel);