[reactor-netty-http] Change package io.netty.* to io.netty5.*

- netty-codec-haproxy to io.netty.contrib - netty-handler-proxy to io.netty.contrib - JsonObjectDecoder to io.netty.contrib - ByteBuf API is obtain from Netty 4 Related to #1873
reactor · May 19, 2022 · 1b60ccb · 1b60ccb
1 parent cc2f8fa
commit 1b60ccb
Show file tree

Hide file tree

Showing 114 changed files with 778 additions and 778 deletions.
diff --git a/reactor-netty-http/build.gradle b/reactor-netty-http/build.gradle
@@ -25,8 +25,8 @@ ext {
 			"Export-Package" : "reactor.netty.http*;version=$osgiVersion;-noimport:=true",
 			"Import-Package": [
 					"!javax.annotation",
-					"io.netty.channel.kqueue;resolution:=optional;version=\"[4.1,5)\"",
-					"io.netty.handler.codec.haproxy;resolution:=optional;version=\"[4.1,5)\"",
+					"io.netty5.channel.kqueue;resolution:=optional;version=\"[4.1,5)\"",
+					"io.netty.contrib.handler.codec.haproxy;resolution:=optional;version=\"[4.1,5)\"",
 					"io.netty.incubator.channel.uring;resolution:=optional",
 					"io.micrometer.*;resolution:=optional",
 					"*"

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/Cookies.java b/reactor-netty-http/src/main/java/reactor/netty/http/Cookies.java
@@ -24,12 +24,12 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.cookie.ClientCookieDecoder;
-import io.netty.handler.codec.http.cookie.Cookie;
-import io.netty.handler.codec.http.cookie.CookieDecoder;
-import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
+import io.netty5.handler.codec.http.HttpHeaderNames;
+import io.netty5.handler.codec.http.HttpHeaders;
+import io.netty5.handler.codec.http.cookie.ClientCookieDecoder;
+import io.netty5.handler.codec.http.cookie.Cookie;
+import io.netty5.handler.codec.http.cookie.CookieDecoder;
+import io.netty5.handler.codec.http.cookie.ServerCookieDecoder;
 
 /**
  * Store cookies for the http channel.

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/Http11SslContextSpec.java b/reactor-netty-http/src/main/java/reactor/netty/http/Http11SslContextSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2021-2022 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package reactor.netty.http;
 
-import io.netty.handler.ssl.IdentityCipherSuiteFilter;
-import io.netty.handler.ssl.OpenSsl;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
+import io.netty5.handler.ssl.IdentityCipherSuiteFilter;
+import io.netty5.handler.ssl.OpenSsl;
+import io.netty5.handler.ssl.SslContext;
+import io.netty5.handler.ssl.SslContextBuilder;
 import reactor.netty.tcp.AbstractProtocolSslContextSpec;
 
 import javax.net.ssl.KeyManager;
@@ -29,13 +29,13 @@
 import java.security.cert.X509Certificate;
 import java.util.function.Consumer;
 
-import static io.netty.handler.ssl.SslProvider.JDK;
-import static io.netty.handler.ssl.SslProvider.OPENSSL;
+import static io.netty5.handler.ssl.SslProvider.JDK;
+import static io.netty5.handler.ssl.SslProvider.OPENSSL;
 
 /**
  * SslContext builder that provides default configuration specific to HTTP/1.x as follows:
  * <ul>
- *     <li>{@link io.netty.handler.ssl.SslProvider} will be set depending on {@code OpenSsl.isAvailable()}</li>
+ *     <li>{@link io.netty5.handler.ssl.SslProvider} will be set depending on {@code OpenSsl.isAvailable()}</li>
  *     <li>The default cipher suites will be used</li>
  *     <li>Application protocol negotiation configuration is disabled</li>
  * </ul>

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/Http2SettingsSpec.java b/reactor-netty-http/src/main/java/reactor/netty/http/Http2SettingsSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2022 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package reactor.netty.http;
 
-import io.netty.handler.codec.http2.Http2CodecUtil;
-import io.netty.handler.codec.http2.Http2Settings;
+import io.netty5.handler.codec.http2.Http2CodecUtil;
+import io.netty5.handler.codec.http2.Http2Settings;
 import reactor.util.annotation.Nullable;
 
 import java.util.Objects;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/Http2SslContextSpec.java b/reactor-netty-http/src/main/java/reactor/netty/http/Http2SslContextSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2021-2022 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package reactor.netty.http;
 
-import io.netty.handler.codec.http2.Http2SecurityUtil;
-import io.netty.handler.ssl.ApplicationProtocolConfig;
-import io.netty.handler.ssl.ApplicationProtocolNames;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.handler.ssl.SupportedCipherSuiteFilter;
+import io.netty5.handler.codec.http2.Http2SecurityUtil;
+import io.netty5.handler.ssl.ApplicationProtocolConfig;
+import io.netty5.handler.ssl.ApplicationProtocolNames;
+import io.netty5.handler.ssl.SslContext;
+import io.netty5.handler.ssl.SslContextBuilder;
+import io.netty5.handler.ssl.SslProvider;
+import io.netty5.handler.ssl.SupportedCipherSuiteFilter;
 import reactor.netty.tcp.AbstractProtocolSslContextSpec;
 
 import javax.net.ssl.KeyManager;
@@ -32,13 +32,13 @@
 import java.security.cert.X509Certificate;
 import java.util.function.Consumer;
 
-import static io.netty.handler.ssl.SslProvider.JDK;
-import static io.netty.handler.ssl.SslProvider.OPENSSL;
+import static io.netty5.handler.ssl.SslProvider.JDK;
+import static io.netty5.handler.ssl.SslProvider.OPENSSL;
 
 /**
  * SslContext builder that provides default configuration specific to HTTP/2 as follows:
  * <ul>
- *     <li>{@link io.netty.handler.ssl.SslProvider} will be set depending on {@code OpenSsl.isAlpnSupported()}</li>
+ *     <li>{@link io.netty5.handler.ssl.SslProvider} will be set depending on {@code OpenSsl.isAlpnSupported()}</li>
  *     <li>{@link Http2SecurityUtil#CIPHERS}</li>
  *     <li>Application protocol negotiation configuration is enabled</li>
  *     <li>HTTP/1.1 and HTTP/2 support in order to support upgrade to HTTP/2</li>

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/HttpInfos.java b/reactor-netty-http/src/main/java/reactor/netty/http/HttpInfos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2011-2022 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.cookie.Cookie;
+import io.netty5.handler.codec.http.HttpMethod;
+import io.netty5.handler.codec.http.HttpVersion;
+import io.netty5.handler.codec.http.cookie.Cookie;
 
 /**
  * An Http Reactive Channel with several accessors related to HTTP flow: headers, params,

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/HttpOperations.java b/reactor-netty-http/src/main/java/reactor/netty/http/HttpOperations.java
@@ -30,17 +30,17 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.ByteBufHolder;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInboundHandler;
-import io.netty.channel.CombinedChannelDuplexHandler;
-import io.netty.handler.codec.ByteToMessageCodec;
-import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.http.FullHttpMessage;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpMessage;
-import io.netty.handler.codec.http.HttpUtil;
-import io.netty.handler.codec.http.LastHttpContent;
-import io.netty.util.ReferenceCountUtil;
+import io.netty5.channel.ChannelHandler;
+import io.netty5.channel.ChannelInboundHandler;
+import io.netty5.channel.CombinedChannelDuplexHandler;
+import io.netty5.handler.codec.ByteToMessageCodec;
+import io.netty5.handler.codec.ByteToMessageDecoder;
+import io.netty5.handler.codec.http.FullHttpMessage;
+import io.netty5.handler.codec.http.HttpHeaderNames;
+import io.netty5.handler.codec.http.HttpMessage;
+import io.netty5.handler.codec.http.HttpUtil;
+import io.netty5.handler.codec.http.LastHttpContent;
+import io.netty5.util.ReferenceCountUtil;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 import reactor.netty.Connection;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/HttpResources.java b/reactor-netty-http/src/main/java/reactor/netty/http/HttpResources.java
@@ -20,7 +20,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import io.netty.resolver.AddressResolverGroup;
+import io.netty5.resolver.AddressResolverGroup;
 import reactor.core.publisher.Mono;
 import reactor.netty.resources.ConnectionProvider;
 import reactor.netty.resources.LoopResources;

diff --git a/...-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java b/...-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java
@@ -17,13 +17,13 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.LastHttpContent;
+import io.netty5.channel.Channel;
+import io.netty5.channel.ChannelDuplexHandler;
+import io.netty5.channel.ChannelHandlerContext;
+import io.netty5.channel.ChannelPromise;
+import io.netty5.handler.codec.http.HttpRequest;
+import io.netty5.handler.codec.http.HttpResponse;
+import io.netty5.handler.codec.http.LastHttpContent;
 import reactor.netty.channel.ChannelOperations;
 import reactor.util.annotation.Nullable;
 import reactor.util.context.ContextView;

diff --git a/...ty-http/src/main/java/reactor/netty/http/client/ContextAwareHttpClientMetricsHandler.java b/...ty-http/src/main/java/reactor/netty/http/client/ContextAwareHttpClientMetricsHandler.java
@@ -15,7 +15,7 @@
  */
 package reactor.netty.http.client;
 
-import io.netty.channel.ChannelHandlerContext;
+import io.netty5.channel.ChannelHandlerContext;
 import reactor.util.annotation.Nullable;
 
 import java.net.SocketAddress;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/FailedHttpClientRequest.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/FailedHttpClientRequest.java
@@ -15,13 +15,13 @@
  */
 package reactor.netty.http.client;
 
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaderValues;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.cookie.ClientCookieDecoder;
-import io.netty.handler.codec.http.cookie.Cookie;
+import io.netty5.handler.codec.http.HttpHeaderNames;
+import io.netty5.handler.codec.http.HttpHeaderValues;
+import io.netty5.handler.codec.http.HttpHeaders;
+import io.netty5.handler.codec.http.HttpMethod;
+import io.netty5.handler.codec.http.HttpVersion;
+import io.netty5.handler.codec.http.cookie.ClientCookieDecoder;
+import io.netty5.handler.codec.http.cookie.Cookie;
 import reactor.netty.http.Cookies;
 import reactor.netty.http.HttpOperations;
 import reactor.util.context.ContextView;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/Http2ConnectionProvider.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/Http2ConnectionProvider.java
@@ -15,18 +15,18 @@
  */
 package reactor.netty.http.client;
 
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.http2.Http2Connection;
-import io.netty.handler.codec.http2.Http2FrameCodec;
-import io.netty.handler.codec.http2.Http2LocalFlowController;
-import io.netty.handler.codec.http2.Http2StreamChannel;
-import io.netty.handler.ssl.ApplicationProtocolNames;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.resolver.AddressResolverGroup;
-import io.netty.util.AttributeKey;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
+import io.netty5.channel.Channel;
+import io.netty5.channel.ChannelPipeline;
+import io.netty5.handler.codec.http2.Http2Connection;
+import io.netty5.handler.codec.http2.Http2FrameCodec;
+import io.netty5.handler.codec.http2.Http2LocalFlowController;
+import io.netty5.handler.codec.http2.Http2StreamChannel;
+import io.netty5.handler.ssl.ApplicationProtocolNames;
+import io.netty5.handler.ssl.SslHandler;
+import io.netty5.resolver.AddressResolverGroup;
+import io.netty5.util.AttributeKey;
+import io.netty5.util.concurrent.Future;
+import io.netty5.util.concurrent.GenericFutureListener;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscription;
 import reactor.core.CoreSubscriber;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/Http2Pool.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/Http2Pool.java
@@ -25,8 +25,8 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import io.netty.handler.codec.http2.Http2FrameCodec;
-import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty5.handler.codec.http2.Http2FrameCodec;
+import io.netty5.handler.codec.http2.Http2MultiplexHandler;
 import org.reactivestreams.Subscription;
 import reactor.core.CoreSubscriber;
 import reactor.core.Disposable;

diff --git a/...or-netty-http/src/main/java/reactor/netty/http/client/Http2StreamBridgeClientHandler.java b/...or-netty-http/src/main/java/reactor/netty/http/client/Http2StreamBridgeClientHandler.java
@@ -16,11 +16,11 @@
 package reactor.netty.http.client;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.handler.codec.http.DefaultHttpContent;
-import io.netty.handler.codec.http2.Http2StreamFrameToHttpObjectCodec;
+import io.netty5.channel.ChannelDuplexHandler;
+import io.netty5.channel.ChannelHandlerContext;
+import io.netty5.channel.ChannelPromise;
+import io.netty5.handler.codec.http.DefaultHttpContent;
+import io.netty5.handler.codec.http2.Http2StreamFrameToHttpObjectCodec;
 import reactor.netty.Connection;
 import reactor.netty.ConnectionObserver;
 import reactor.netty.channel.ChannelOperations;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java
@@ -28,18 +28,18 @@
 import java.util.function.Supplier;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaderValues;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpUtil;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.cookie.ClientCookieDecoder;
-import io.netty.handler.codec.http.cookie.ClientCookieEncoder;
-import io.netty.handler.codec.http.cookie.Cookie;
-import io.netty.handler.codec.http.cookie.DefaultCookie;
-import io.netty.handler.ssl.OpenSsl;
-import io.netty.handler.ssl.SslContext;
+import io.netty5.handler.codec.http.HttpHeaderNames;
+import io.netty5.handler.codec.http.HttpHeaderValues;
+import io.netty5.handler.codec.http.HttpHeaders;
+import io.netty5.handler.codec.http.HttpMethod;
+import io.netty5.handler.codec.http.HttpUtil;
+import io.netty5.handler.codec.http.HttpVersion;
+import io.netty5.handler.codec.http.cookie.ClientCookieDecoder;
+import io.netty5.handler.codec.http.cookie.ClientCookieEncoder;
+import io.netty5.handler.codec.http.cookie.Cookie;
+import io.netty5.handler.codec.http.cookie.DefaultCookie;
+import io.netty5.handler.ssl.OpenSsl;
+import io.netty5.handler.ssl.SslContext;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import reactor.core.publisher.Flux;
@@ -298,7 +298,7 @@ public interface WebsocketReceiver<S extends WebsocketReceiver<?>> extends UriCo
 		 * or the returned {@link Flux} might be necessary if the remote never
 		 * terminates itself.
 		 * <p> If the upgrade fails, the returned {@link Flux} will emit a
-		 * {@link io.netty.handler.codec.http.websocketx.WebSocketHandshakeException}
+		 * {@link io.netty5.handler.codec.http.websocketx.WebSocketHandshakeException}
 		 *
 		 * @param receiver extracting receiver
 		 * @param <V> the extracted flux type
@@ -314,7 +314,7 @@ public interface WebsocketReceiver<S extends WebsocketReceiver<?>> extends UriCo
 		 * disposed OR when a close frame has been received, forwarding onComplete to
 		 * the returned flux subscription.
 		 * <p> If the upgrade fails, the returned {@link Flux} will emit a
-		 * {@link io.netty.handler.codec.http.websocketx.WebSocketHandshakeException}
+		 * {@link io.netty5.handler.codec.http.websocketx.WebSocketHandshakeException}
 		 *
 		 * @return a {@link ByteBufFlux} of the inbound websocket content
 		 */
@@ -959,7 +959,7 @@ public final HttpClient http2Settings(Consumer<Http2SettingsSpec.Builder> http2S
 	}
 
 	/**
-	 * Configure the {@link io.netty.handler.codec.http.HttpClientCodec}'s response decoding options.
+	 * Configure the {@link io.netty5.handler.codec.http.HttpClientCodec}'s response decoding options.
 	 *
 	 * @param responseDecoderOptions a function to mutate the provided Http response decoder options
 	 * @return a new {@link HttpClient}
@@ -1196,7 +1196,7 @@ public RequestSender request(HttpMethod method) {
 
 	/**
 	 * Specifies the maximum duration allowed between each network-level read operation while reading a given response
-	 * (resolution: ms). In other words, {@link io.netty.handler.timeout.ReadTimeoutHandler} is added to the channel
+	 * (resolution: ms). In other words, {@link io.netty5.handler.timeout.ReadTimeoutHandler} is added to the channel
 	 * pipeline after sending the request and is removed when the response is fully received.
 	 * If the {@code maxReadOperationInterval} is {@code null}, any previous setting will be removed and no
 	 * {@code maxReadOperationInterval} will be applied.
@@ -1209,7 +1209,7 @@ public RequestSender request(HttpMethod method) {
 	 *                                 (resolution: ms).
 	 * @return a new {@link HttpClient}
 	 * @since 0.9.11
-	 * @see io.netty.handler.timeout.ReadTimeoutHandler
+	 * @see io.netty5.handler.timeout.ReadTimeoutHandler
 	 */
 	public final HttpClient responseTimeout(@Nullable Duration maxReadOperationInterval) {
 		if (Objects.equals(maxReadOperationInterval, configuration().responseTimeout)) {