Skip to content

Commit

Permalink
Polish
Browse files Browse the repository at this point in the history 
Signed-off-by: Violeta Georgieva <violeta.georgieva@broadcom.com>
  • Loading branch information
@violetagg
violetagg committed Jan 28, 2025
1 parent b568f28 commit f22a2bd
Show file tree
Hide file tree
Showing 15 changed files with 191 additions and 217 deletions.
4 changes: 2 additions & 2 deletions ...or-netty-http/src/main/java/reactor/netty/http/server/Http2StreamBridgeServerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
final class Http2StreamBridgeServerHandler extends ChannelDuplexHandler {

final BiPredicate<HttpServerRequest, HttpServerResponse> compress;
final HttpCompressionOptionsSpec compressionOptions;
final HttpCompressionOptionsSpec compressionOptions;
final ServerCookieDecoder cookieDecoder;
final ServerCookieEncoder cookieEncoder;
final HttpServerFormDecoderProvider formDecoderProvider;
Expand Down Expand Up @@ -143,8 +143,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
ops = new HttpServerOperations(Connection.from(ctx.channel()),
listener,
request,
compress,
compressionOptions,
compress,
connectionInfo,
cookieDecoder,
cookieEncoder,
Expand Down
12 changes: 6 additions & 6 deletions reactor-netty-http/src/main/java/reactor/netty/http/server/Http3Codec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {

final boolean accessLogEnabled;
final Function<AccessLogArgProvider, AccessLog> accessLog;
final HttpCompressionOptionsSpec compressionOptions;
final BiPredicate<HttpServerRequest, HttpServerResponse> compressPredicate;
final ServerCookieDecoder cookieDecoder;
final ServerCookieEncoder cookieEncoder;
Expand All @@ -64,7 +65,6 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
final Function<String, String> methodTagValue;
final ChannelMetricsRecorder metricsRecorder;
final int minCompressionSize;
final HttpCompressionOptionsSpec compressionOptions;
final ChannelOperations.OnSetup opsFactory;
final Duration readTimeout;
final Duration requestTimeout;
Expand All @@ -74,6 +74,7 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
Http3Codec(
boolean accessLogEnabled,
@Nullable Function<AccessLogArgProvider, AccessLog> accessLog,
@Nullable HttpCompressionOptionsSpec compressionOptions,
@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressPredicate,
ServerCookieDecoder decoder,
ServerCookieEncoder encoder,
Expand All @@ -85,14 +86,14 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
@Nullable Function<String, String> methodTagValue,
@Nullable ChannelMetricsRecorder metricsRecorder,
int minCompressionSize,
@Nullable HttpCompressionOptionsSpec compressionOptions,
ChannelOperations.OnSetup opsFactory,
@Nullable Duration readTimeout,
@Nullable Duration requestTimeout,
@Nullable Function<String, String> uriTagValue,
boolean validate) {
this.accessLogEnabled = accessLogEnabled;
this.accessLog = accessLog;
this.compressionOptions = compressionOptions;
this.compressPredicate = compressPredicate;
this.cookieDecoder = decoder;
this.cookieEncoder = encoder;
Expand All @@ -104,7 +105,6 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
this.methodTagValue = methodTagValue;
this.metricsRecorder = metricsRecorder;
this.minCompressionSize = minCompressionSize;
this.compressionOptions = compressionOptions;
this.opsFactory = opsFactory;
this.readTimeout = readTimeout;
this.requestTimeout = requestTimeout;
Expand Down Expand Up @@ -159,6 +159,7 @@ else if (metricsRecorder instanceof ContextAwareHttpServerMetricsRecorder) {
static ChannelHandler newHttp3ServerConnectionHandler(
boolean accessLogEnabled,
@Nullable Function<AccessLogArgProvider, AccessLog> accessLog,
@Nullable HttpCompressionOptionsSpec compressionOptions,
@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressPredicate,
ServerCookieDecoder decoder,
ServerCookieEncoder encoder,
Expand All @@ -170,15 +171,14 @@ static ChannelHandler newHttp3ServerConnectionHandler(
@Nullable Function<String, String> methodTagValue,
@Nullable ChannelMetricsRecorder metricsRecorder,
int minCompressionSize,
@Nullable HttpCompressionOptionsSpec compressionOptions,
ChannelOperations.OnSetup opsFactory,
@Nullable Duration readTimeout,
@Nullable Duration requestTimeout,
@Nullable Function<String, String> uriTagValue,
boolean validate) {
return new Http3ServerConnectionHandler(
new Http3Codec(accessLogEnabled, accessLog, compressPredicate, decoder, encoder, formDecoderProvider, forwardedHeaderHandler,
httpMessageLogFactory, listener, mapHandle, methodTagValue, metricsRecorder, minCompressionSize, compressionOptions,
new Http3Codec(accessLogEnabled, accessLog, compressionOptions, compressPredicate, decoder, encoder, formDecoderProvider, forwardedHeaderHandler,
httpMessageLogFactory, listener, mapHandle, methodTagValue, metricsRecorder, minCompressionSize,
opsFactory, readTimeout, requestTimeout, uriTagValue, validate));
}
}
4 changes: 2 additions & 2 deletions reactor-netty-http/src/main/java/reactor/netty/http/server/Http3ServerOperations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ final class Http3ServerOperations extends HttpServerOperations {
Connection c,
ConnectionObserver listener,
HttpRequest nettyRequest,
@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressionPredicate,
@Nullable HttpCompressionOptionsSpec compressionOptions,
@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressionPredicate,
ConnectionInfo connectionInfo,
ServerCookieDecoder decoder,
ServerCookieEncoder encoder,
Expand All @@ -56,7 +56,7 @@ final class Http3ServerOperations extends HttpServerOperations {
@Nullable Duration requestTimeout,
boolean secured,
ZonedDateTime timestamp) {
super(c, listener, nettyRequest, compressionPredicate, compressionOptions, connectionInfo, decoder, encoder, formDecoderProvider,
super(c, listener, nettyRequest, compressionOptions, compressionPredicate, connectionInfo, decoder, encoder, formDecoderProvider,
httpMessageLogFactory, isHttp2, mapHandle, readTimeout, requestTimeout, secured, timestamp, true);
}

Expand Down
4 changes: 2 additions & 2 deletions ...or-netty-http/src/main/java/reactor/netty/http/server/Http3StreamBridgeServerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

final class Http3StreamBridgeServerHandler extends ChannelDuplexHandler {
final BiPredicate<HttpServerRequest, HttpServerResponse> compress;
final HttpCompressionOptionsSpec compressionOptions;
final HttpCompressionOptionsSpec compressionOptions;
final ServerCookieDecoder cookieDecoder;
final ServerCookieEncoder cookieEncoder;
final HttpServerFormDecoderProvider formDecoderProvider;
Expand Down Expand Up @@ -134,8 +134,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
ops = new Http3ServerOperations(Connection.from(ctx.channel()),
listener,
request,
compress,
compressionOptions,
compress,
connectionInfo,
cookieDecoder,
cookieEncoder,
Expand Down
42 changes: 22 additions & 20 deletions reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public final HttpServer compress(BiPredicate<HttpServerRequest, HttpServerRespon
/**
* Specifies whether GZip response compression is enabled if the client request
* presents accept encoding.
* default compression level is 6.
* Default compression level is 6.
*
* @param compressionEnabled if true GZip response compression
* is enabled if the client request presents accept encoding, otherwise disabled.
Expand Down Expand Up @@ -341,28 +341,30 @@ public final HttpServer compress(int minResponseSize) {

/**
* Specifies GZip, Deflate, ZSTD compression option
* with {@link reactor.netty.http.server.compression.GzipOption}, {@link reactor.netty.http.server.compression.DeflateOption}, , {@link reactor.netty.http.server.compression.ZstdOption}.
* with {@link reactor.netty.http.server.compression.GzipOption}, {@link reactor.netty.http.server.compression.DeflateOption},
* {@link reactor.netty.http.server.compression.ZstdOption}.
*
* @param compressionOptions configures {@link HttpCompressionOption} after enable compress.
* @param compressionOptions configures {@link HttpCompressionOption} after enable compress
*
* <pre>
* {@code
* HttpServer.create()
* .compress(true)
* .compressOptions(
* GzipOption.builder()
* .compressionLevel(6)
* .windowBits(15)
* .memoryLevel(8)
* .build(),
* ZstdOption.builder()
* .compressionLevel(3)
* .build()
* )
* .bindNow();
* }
* </pre>
* <pre>
* {@code
* HttpServer.create()
* .compress(true)
* .compressOptions(
* GzipOption.builder()
* .compressionLevel(6)
* .windowBits(15)
* .memoryLevel(8)
* .build(),
* ZstdOption.builder()
* .compressionLevel(3)
* .build()
* )
* .bindNow();
* }
* </pre>
* @return a new {@link HttpServer}
* @since 1.2.3
*/
public final HttpServer compressOptions(HttpCompressionOption... compressionOptions) {
Objects.requireNonNull(compressionOptions, "compressionOptions");
Expand Down
Loading

0 comments on commit f22a2bd

Please sign in to comment.