Merge #3196 into 2.0.0-M4

reactor-netty5-core/src/test/java/reactor/netty5/tcp/TcpServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2011-2024 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.
@@ -1116,6 +1116,7 @@ void testDisposeTimeoutLongOverflow() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testSniSupport() throws Exception {
 		SelfSignedCertificate defaultCert = new SelfSignedCertificate("default");
 		TcpSslContextSpec defaultTcpSslContextSpec =

reactor-netty5-http/src/test/java/reactor/netty5/http/Http2Tests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2024 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.
@@ -98,6 +98,7 @@ void testHttpNoSslH2Fails() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttpSslH2CFails() {
 		Http2SslContextSpec serverOptions = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 
@@ -225,6 +226,7 @@ void doTestMaxActiveStreams(HttpClient baseClient, int maxActiveStreams, int exp
 		doTestMaxActiveStreams(baseClient, maxActiveStreams, 256, 32, expectedOnNext, expectedOnError);
 	}
 
+	@SuppressWarnings("deprecation")
 	void doTestMaxActiveStreams(HttpClient baseClient, int maxActiveStreams, int concurrency, int prefetch, int expectedOnNext, int expectedOnError) throws Exception {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -287,6 +289,7 @@ else if (signal.getThrowable() instanceof PoolAcquireTimeoutException &&
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttp2ForMemoryLeaks() {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -375,6 +378,7 @@ void testMonoRequestBodySentAsFullRequest_Mono() {
 		doTestMonoRequestBodySentAsFullRequest(BufferMono.fromString(Mono.just("test")), 1);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void doTestMonoRequestBodySentAsFullRequest(Publisher<? extends Buffer> body, int expectedMsg) {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -440,6 +444,7 @@ void testIssue1394_SchemeHttpConfiguredHTTP11AndH2NegotiatedHTTP11() {
 		doTestIssue1394_SchemeHttp("null", HttpProtocol.HTTP11, HttpProtocol.H2);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void doTestIssue1394_SchemeHttp(String expectedStreamId, HttpProtocol... protocols) {
 		disposableServer =
 				createServer()
@@ -556,6 +561,7 @@ void testTooManyPermitsReturned_CustomPool() {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	private void testTooManyPermitsReturned(HttpClient client) {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -621,6 +627,7 @@ void testPR2659_SchemeHttpsConfiguredWithSsl() {
 		doTestPR2659_SchemeHttps(s -> !"null".equals(s.toString()));
 	}
 
+	@SuppressWarnings("deprecation")
 	private static void doTestPR2659_SchemeHttps(Predicate<CharSequence> predicate) {
 		HttpClient.create()
 		          .protocol(HttpProtocol.HTTP11, HttpProtocol.H2, HttpProtocol.H2C)
@@ -650,6 +657,7 @@ void testMaxStreamsH2C(HttpProtocol[] serverProtocols, HttpProtocol[] clientProt
 
 	@ParameterizedTest
 	@MethodSource("h2CompatibleCombinations")
+	@SuppressWarnings("deprecation")
 	void testMaxStreamsH2(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtocols) {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -707,6 +715,7 @@ void testEmptyDataFrameH2C(HttpProtocol[] serverProtocols, HttpProtocol[] client
 
 	@ParameterizedTest
 	@MethodSource("h2CompatibleCombinations")
+	@SuppressWarnings("deprecation")
 	void testEmptyDataFrameH2(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtocols) {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =

reactor-netty5-http/src/test/java/reactor/netty5/http/HttpCompressionClientServerTests.java

@@ -65,6 +65,7 @@ class HttpCompressionClientServerTests extends BaseHttpTest {
 	@interface ParameterizedCompressionTest {
 	}
 
+	@SuppressWarnings("deprecation")
 	static Object[][] data() throws Exception {
 		SelfSignedCertificate cert = new SelfSignedCertificate();
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(cert.certificate(), cert.privateKey());

reactor-netty5-http/src/test/java/reactor/netty5/http/HttpMetricsHandlerTests.java

@@ -849,6 +849,7 @@ void testServerConnectionsRecorderConnectionClose(HttpProtocol[] serverProtocols
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testIssue896() throws Exception {
 		disposableServer = httpServer.noSSL()
 		                             .bindNow();
@@ -946,6 +947,7 @@ void testServerConnectionsRecorderBadUriForwarded(HttpProtocol[] serverProtocols
 
 	@ParameterizedTest
 	@MethodSource("combinationsIssue2956")
+	@SuppressWarnings("deprecation")
 	void testIssue2956(boolean isCustomRecorder, boolean isHttp2) throws Exception {
 		HttpServer server =
 				httpServer.secure(spec -> spec.sslContext(isHttp2 ? serverCtx2 : serverCtx11))
@@ -1277,10 +1279,12 @@ private void checkExpectationsBadRequest(String serverAddress, boolean checkTls)
 		assertCounter(registry, CLIENT_ERRORS, summaryTags2).isNull();
 	}
 
+	@SuppressWarnings("deprecation")
 	HttpServer customizeServerOptions(HttpServer httpServer, @Nullable ProtocolSslContextSpec ctx, HttpProtocol[] protocols) {
 		return ctx == null ? httpServer.protocol(protocols) : httpServer.protocol(protocols).secure(spec -> spec.sslContext(ctx));
 	}
 
+	@SuppressWarnings("deprecation")
 	HttpClient customizeClientOptions(HttpClient httpClient, @Nullable ProtocolSslContextSpec ctx, HttpProtocol[] protocols) {
 		return ctx == null ? httpClient.protocol(protocols) : httpClient.protocol(protocols).secure(spec -> spec.sslContext(ctx));
 	}

reactor-netty5-http/src/test/java/reactor/netty5/http/HttpProtocolsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2024 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.
@@ -180,6 +180,7 @@ static Object[][] dataCompatibleCombinations_CustomPool() throws Exception {
 		return data(true, false, true);
 	}
 
+	@SuppressWarnings("deprecation")
 	static Object[][] data(boolean onlyCompatible, boolean disablePool, boolean useCustomPool) throws Exception {
 		SelfSignedCertificate cert = new SelfSignedCertificate();
 		Http11SslContextSpec serverCtxHttp11 = Http11SslContextSpec.forServer(cert.certificate(), cert.privateKey());

reactor-netty5-http/src/test/java/reactor/netty5/http/HttpResponseStatusCodesHandlingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2017-2024 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.
@@ -71,6 +71,7 @@ void httpStatusCode404IsHandledByTheClient() {
 
 	@ParameterizedTest
 	@MethodSource("httpCompatibleCombinations")
+	@SuppressWarnings("deprecation")
 	void noContentStatusCodes(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtocols) throws Exception {
 		SelfSignedCertificate ssc = new SelfSignedCertificate();
 

reactor-netty5-http/src/test/java/reactor/netty5/http/client/ConnectionPoolTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2021-2024 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.
@@ -75,6 +75,7 @@ class ConnectionPoolTests extends BaseHttpTest {
 	HttpClient client;
 
 	@BeforeAll
+	@SuppressWarnings("deprecation")
 	static void prepare() throws CertificateException {
 		HttpServer server = createServer();
 
@@ -359,6 +360,7 @@ void testClientWithDecoder() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testClientWithProtocols() {
 		Http11SslContextSpec http11SslContextSpec =
 				Http11SslContextSpec.forClient()
@@ -381,6 +383,7 @@ void testClientWithProtocols() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testClientWithSecurity_1() {
 		Http11SslContextSpec http11SslContextSpec1 =
 				Http11SslContextSpec.forClient()
@@ -402,6 +405,7 @@ void testClientWithSecurity_1() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testClientWithSecurity_2() {
 		HttpClient localClient1 =
 				client.port(server4.port())

reactor-netty5-http/src/test/java/reactor/netty5/http/client/HttpClientProxyTest.java

@@ -226,6 +226,7 @@ void shouldNotResolveTargetHostnameWhenMetricsDisabled(Hoverfly hoverfly) {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void shouldUseDifferentResolvers(Hoverfly hoverfly) {
 		Http11SslContextSpec http11SslContextSpec =
 				Http11SslContextSpec.forClient()
@@ -278,6 +279,7 @@ private Mono<Tuple2<String, HttpHeaders>>  sendRequest(
 		return sendRequest(proxyOptions, connectAddressSupplier, uri, wiretap, false, false);
 	}
 
+	@SuppressWarnings("deprecation")
 	private Mono<Tuple2<String, HttpHeaders>>  sendRequest(
 			Consumer<? super ProxyProvider.TypeSpec> proxyOptions,
 			@Nullable Supplier<? extends SocketAddress> connectAddressSupplier,

reactor-netty5-http/src/test/java/reactor/netty5/http/client/HttpClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2011-2024 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.
@@ -915,6 +915,7 @@ void testIssue361() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testIssue473() {
 		Http11SslContextSpec serverSslContextBuilder =
 				Http11SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
@@ -934,6 +935,7 @@ void testIssue473() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testIssue407_1() {
 		disposableServer =
 				createServer()
@@ -995,6 +997,7 @@ void testIssue407_1() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testIssue407_2() {
 		disposableServer =
 				createServer()
@@ -1822,6 +1825,7 @@ void testIssue719_CLNoTextWithSSL() {
 				h -> h.set("Content-Length", "0"), true);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void doTestIssue719(Publisher<Buffer> clientSend,
 			Consumer<HttpHeaders> clientSendHeaders, boolean ssl) {
 		HttpServer server =
@@ -2047,6 +2051,7 @@ void testConnectionLifeTimeFixedPoolHttp1() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testConnectionLifeTimeFixedPoolHttp2_1() throws Exception {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -2089,6 +2094,7 @@ void testConnectionLifeTimeElasticPoolHttp1() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testConnectionLifeTimeElasticPoolHttp2() throws Exception {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -2130,6 +2136,7 @@ void testConnectionNoLifeTimeFixedPoolHttp1() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testConnectionNoLifeTimeFixedPoolHttp2() throws Exception {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -2168,6 +2175,7 @@ void testConnectionNoLifeTimeElasticPoolHttp1() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testConnectionNoLifeTimeElasticPoolHttp2() throws Exception {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =
@@ -2214,6 +2222,7 @@ private ChannelId[] doTestConnectionLifeTime(HttpServer server, HttpClient clien
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testConnectionLifeTimeFixedPoolHttp2_2() {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =

reactor-netty5-http/src/test/java/reactor/netty5/http/client/HttpRedirectTest.java

@@ -420,6 +420,7 @@ void testFollowRedirectPredicateThrowsException() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testIssue843() {
 		final int server2Port = SocketUtils.findAvailableTcpPort();
 
@@ -472,6 +473,7 @@ void testIssue843() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttpRequestIfRedirectHttpToHttpsEnabled() {
 		Http11SslContextSpec sslContext = Http11SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		disposableServer =
@@ -502,6 +504,7 @@ void testHttpRequestIfRedirectHttpToHttpsEnabled() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttpsRequestIfRedirectHttpToHttpsEnabled() {
 		String message = "The client should receive the message";
 		disposableServer =
@@ -529,6 +532,7 @@ void testHttpsRequestIfRedirectHttpToHttpsEnabled() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testRelativeRedirectKeepsScheme() {
 		final String requestPath = "/request";
 		final String redirectPath = "/redirect";
@@ -562,6 +566,7 @@ void testRelativeRedirectKeepsScheme() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testLastLocationSetToResourceUrlOnRedirect() {
 		final String redirectPath = "/redirect";
 		final String destinationPath = "/destination";
@@ -674,6 +679,7 @@ void testHttpServerWithDomainSockets_HTTP11() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttpServerWithDomainSockets_HTTP2() {
 		Http11SslContextSpec serverCtx = Http11SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http11SslContextSpec clientCtx =
@@ -708,6 +714,7 @@ private void doTestHttpServerWithDomainSockets(HttpServer server, HttpClient cli
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void testHttp2Redirect() {
 		Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
 		Http2SslContextSpec clientCtx =

reactor-netty5-http/src/test/java/reactor/netty5/http/client/WebsocketTest.java

@@ -1486,6 +1486,7 @@ private void doTestConnectionClosedWhenFailedUpgrade(
 
 	@ParameterizedTest
 	@MethodSource("http11CompatibleProtocols")
+	@SuppressWarnings("deprecation")
 	public void testIssue3036(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtocols,
 			@Nullable SslProvider.ProtocolSslContextSpec serverCtx, @Nullable SslProvider.ProtocolSslContextSpec clientCtx) {
 		WebsocketServerSpec websocketServerSpec = WebsocketServerSpec.builder().compress(true).build();

reactor-netty5-http/src/test/java/reactor/netty5/http/observability/ObservabilitySmokeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2022-2024 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.
@@ -108,6 +108,7 @@ public BiConsumer<BuildingBlocks, Deque<ObservationHandler<? extends Observation
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public SampleTestRunnerConsumer yourCode() {
 		return (bb, meterRegistry) -> {
 			Http2SslContextSpec serverCtxHttp = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
@@ -181,6 +182,7 @@ public SampleTestRunnerConsumer yourCode() {
 		};
 	}
 
+	@SuppressWarnings("deprecation")
 	static void sendHttp2Request(HttpClient client) throws Exception {
 		Http2SslContextSpec clientCtxHttp2 =
 				Http2SslContextSpec.forClient()
@@ -189,6 +191,7 @@ static void sendHttp2Request(HttpClient client) throws Exception {
 		sendRequest(client.secure(spec -> spec.sslContext(clientCtxHttp2)).protocol(HttpProtocol.H2));
 	}
 
+	@SuppressWarnings("deprecation")
 	static void sendHttp11Request(HttpClient client) throws Exception {
 		Http11SslContextSpec clientCtxHttp11 =
 				Http11SslContextSpec.forClient()