Merge #3143 into 1.1.19

build.gradle

@@ -42,6 +42,7 @@ plugins {
 	id 'io.spring.javadoc-aggregate' version '0.0.1' apply false
 	id 'biz.aQute.bnd.builder' version '6.4.0' apply false
 	id 'org.graalvm.buildtools.native' version '0.9.25' apply false
+	id 'net.ltgt.errorprone' version '3.1.0' apply false
 }
 
 description = 'Reactive Streams Netty driver'
@@ -133,6 +134,8 @@ ext {
 	mockitoVersion = '4.11.0'
 	blockHoundVersion = '1.0.8.RELEASE'
 	reflectionsVersion = '0.10.2'
+	errorproneCoreVersion = '2.10.0'
+	errorproneGuavaVersion = '30.0-jre'
 
 	javadocLinks = ["https://docs.oracle.com/javase/8/docs/api/",
 					// Use Reactive Streams 1.0.3 version for javadoc generation

gradle/errorprone.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2018-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.
@@ -13,27 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-buildscript {
-	repositories {
-		maven {
-			url "https://plugins.gradle.org/m2/"
-		}
-	}
-	dependencies {
-		classpath "net.ltgt.gradle:gradle-errorprone-plugin:2.0.2"
-	}
-}
-
-apply plugin: net.ltgt.gradle.errorprone.ErrorPronePlugin
-
-ext {
-	errorproneCoreVersion = "2.7.1"
-	errorproneJavacVersion = "9+181-r4173-1"
-	guavaVersion = "30.0-jre"
-}
+apply plugin: 'net.ltgt.errorprone'
 
 dependencies {
 	errorprone "com.google.errorprone:error_prone_core:$errorproneCoreVersion"
-	errorprone "com.google.guava:guava:$guavaVersion" // prevents conflicts with guava versions of other gradle plugins
-	errorproneJavac "com.google.errorprone:javac:$errorproneJavacVersion"
+	errorprone "com.google.guava:guava:$errorproneGuavaVersion" // prevents conflicts with guava versions of other gradle plugins
 }

reactor-netty-core/src/test/java/reactor/netty/tcp/TcpClientTests.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.
@@ -1086,7 +1086,7 @@ void testTcpClientWithDomainSocketsWithPort() {
 	}
 
 	@Test
-	@SuppressWarnings({"deprecation", "FutureReturnValueIgnored"})
+	@SuppressWarnings({"deprecation", "FutureReturnValueIgnored", "ReturnValueIgnored"})
 	void testBootstrapUnsupported() {
 		assertThatExceptionOfType(UnsupportedOperationException.class)
 				.isThrownBy(() -> TcpClient.create().bootstrap(b -> {
@@ -1166,12 +1166,14 @@ void testBootstrapUnsupported() {
 
 		assertThatExceptionOfType(UnsupportedOperationException.class)
 				.isThrownBy(() -> TcpClient.create().bootstrap(b -> {
+					//ReturnValueIgnored is deliberate
 					b.equals(new Bootstrap());
 					return b;
 				}));
 
 		assertThatExceptionOfType(UnsupportedOperationException.class)
 				.isThrownBy(() -> TcpClient.create().bootstrap(b -> {
+					//ReturnValueIgnored is deliberate
 					b.hashCode();
 					return b;
 				}));
@@ -1185,6 +1187,7 @@ void testBootstrapUnsupported() {
 
 		assertThatExceptionOfType(UnsupportedOperationException.class)
 				.isThrownBy(() -> TcpClient.create().bootstrap(b -> {
+					//ReturnValueIgnored is deliberate
 					b.toString();
 					return b;
 				}));