Polish

See gh-44447

Signed-off-by: Johnny Lim <izeye@naver.com>

Author: izeye

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/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

@@ -166,7 +166,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}.
@@ -1195,7 +1195,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