Merge branch '3.3.x' into 3.4.x

Closes gh-44684

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.data.redis;
 
-import java.util.Map;
-
 import reactor.core.publisher.Flux;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -51,8 +49,7 @@
 public class RedisReactiveHealthContributorAutoConfiguration extends
 		CompositeReactiveHealthContributorConfiguration<RedisReactiveHealthIndicator, ReactiveRedisConnectionFactory> {
 
-	RedisReactiveHealthContributorAutoConfiguration(
-			Map<String, ReactiveRedisConnectionFactory> redisConnectionFactories) {
+	RedisReactiveHealthContributorAutoConfiguration() {
 		super(RedisReactiveHealthIndicator::new);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java

@@ -123,13 +123,11 @@ TestBean standard() {
 		@Bean(defaultCandidate = false)
 		TestBean nonDefault() {
 			return new TestBean();
-
 		}
 
 		@Bean(autowireCandidate = false)
 		TestBean nonAutowire() {
 			return new TestBean();
-
 		}
 
 	}
@@ -145,7 +143,6 @@ TestBean standard() {
 		@Bean(autowireCandidate = false)
 		TestBean nonAutowire() {
 			return new TestBean();
-
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java

@@ -44,7 +44,7 @@
 public @interface AutoConfigureBefore {
 
 	/**
-	 * The auto-configure classes that should have not yet been applied.
+	 * The auto-configuration classes that should have not yet been applied.
 	 * @return the classes
 	 */
 	Class<?>[] value() default {};

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java

@@ -447,7 +447,7 @@ public void cleanUp() {
 		super.cleanUp();
 		LoggerContext loggerContext = getLoggerContext();
 		markAsUninitialized(loggerContext);
-		StatusConsoleListener listener = (StatusConsoleListener) getLoggerContext().getObject(STATUS_LISTENER_KEY);
+		StatusConsoleListener listener = (StatusConsoleListener) loggerContext.getObject(STATUS_LISTENER_KEY);
 		if (listener != null) {
 			StatusLogger.getLogger().removeListener(listener);
 			loggerContext.removeObject(STATUS_LISTENER_KEY);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java

@@ -146,15 +146,15 @@ public final void refresh() throws BeansException, IllegalStateException {
 			super.refresh();
 		}
 		catch (RuntimeException ex) {
-			try {
-				WebServer webServer = this.webServer;
-				if (webServer != null) {
+			WebServer webServer = this.webServer;
+			if (webServer != null) {
+				try {
 					webServer.stop();
 					webServer.destroy();
 				}
-			}
-			catch (RuntimeException stopOrDestroyEx) {
-				ex.addSuppressed(stopOrDestroyEx);
+				catch (RuntimeException stopOrDestroyEx) {
+					ex.addSuppressed(stopOrDestroyEx);
+				}
 			}
 			throw ex;
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java

@@ -44,6 +44,7 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 
 /**
@@ -148,7 +149,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() {
 			.withStackTraceContaining("WebServer has failed to stop");
 		WebServer webServer = this.context.getWebServer();
 		then(webServer).should().stop();
-		then(webServer).should(times(0)).destroy();
+		then(webServer).should(never()).destroy();
 	}
 
 	@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java

@@ -86,6 +86,7 @@
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.withSettings;
 
@@ -236,7 +237,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() {
 			.withStackTraceContaining("WebServer has failed to stop");
 		WebServer webServer = this.context.getWebServer();
 		then(webServer).should().stop();
-		then(webServer).should(times(0)).destroy();
+		then(webServer).should(never()).destroy();
 	}
 
 	@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

@@ -169,7 +169,7 @@
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
 
 /**
  * Base for testing classes that extends {@link AbstractServletWebServerFactory}.
@@ -1193,7 +1193,7 @@ protected void servletContextListenerContextDestroyedIsNotCalledWhenContainerIsS
 		this.webServer = getFactory().getWebServer((servletContext) -> servletContext.addListener(listener));
 		this.webServer.start();
 		this.webServer.stop();
-		then(listener).should(times(0)).contextDestroyed(any(ServletContextEvent.class));
+		then(listener).should(never()).contextDestroyed(any(ServletContextEvent.class));
 	}
 
 	@Test