Merge #2399 into 2.0.0-M2

codequality/checkstyle.xml

@@ -86,7 +86,6 @@
 		<module name="SimplifyBooleanExpression"/>
 		<module name="SimplifyBooleanReturn"/>
 		<module name="StringLiteralEquality"/>
-		<module name="UnnecessaryParentheses"/>
 
 		<!-- Imports -->
 		<module name="AvoidStarImport"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

reactor-netty5-core/src/main/java/reactor/netty5/resources/PooledConnectionProvider.java

@@ -288,7 +288,7 @@ else if (origin instanceof InetSocketAddress isaOrigin && target instanceof Inet
 			if (isaOrigin.getPort() == isaTarget.getPort()) {
 				InetAddress iaTarget = isaTarget.getAddress();
 				return (iaTarget != null && iaTarget.isAnyLocalAddress()) ||
-							   Objects.equals(isaOrigin.getHostString(), isaTarget.getHostString());
+						Objects.equals(isaOrigin.getHostString(), isaTarget.getHostString());
 			}
 		}
 		return false;

reactor-netty5-http/src/main/java/reactor/netty5/http/client/HttpClientConfig.java

@@ -1008,7 +1008,8 @@ public void onUncaughtException(Connection connection, Throwable error) {
 				doOnRequestError.accept(connection.as(HttpClientOperations.class), error);
 				return;
 			}
-			if (doOnResponseError != null && (ops.responseState != null) && !(error instanceof RedirectClientException)) {
+			if (doOnResponseError != null && ops.responseState != null &&
+					!(error instanceof RedirectClientException)) {
 				doOnResponseError.accept(connection.as(HttpClientOperations.class), error);
 			}
 		}

reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServerConfig.java

@@ -1082,7 +1082,7 @@ static final class HttpServerChannelInitializer implements ChannelPipelineConfig
 		public void onChannelInit(ConnectionObserver observer, Channel channel, @Nullable SocketAddress remoteAddress) {
 			if (sslProvider != null) {
 				ChannelPipeline pipeline = channel.pipeline();
-				if (redirectHttpToHttps && ((protocols & h2) != h2)) {
+				if (redirectHttpToHttps && (protocols & h2) != h2) {
 					NonSslRedirectDetector nonSslRedirectDetector = new NonSslRedirectDetector(sslProvider,
 							remoteAddress,
 							SSL_DEBUG);