Merge branch '3.1.x'

Closes gh-38243

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -305,7 +305,7 @@ public class SpringApplication {
 	public ConfigurableApplicationContext run(String... args) {
 		Startup startup = Startup.create();
 		if (this.registerShutdownHook) {
-			SpringApplication.shutdownHook.enableShutdowHookAddition();
+			SpringApplication.shutdownHook.enableShutdownHookAddition();
 		}
 		DefaultBootstrapContext bootstrapContext = createBootstrapContext();
 		ConfigurableApplicationContext context = null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHook.java

@@ -70,7 +70,7 @@ class SpringApplicationShutdownHook implements Runnable {
 		return this.handlers;
 	}
 
-	void enableShutdowHookAddition() {
+	void enableShutdownHookAddition() {
 		this.shutdownHookAdditionEnabled = true;
 	}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationShutdownHookTests.java

@@ -51,7 +51,7 @@ class SpringApplicationShutdownHookTests {
 	@Test
 	void shutdownHookIsNotAddedUntilContextIsRegistered() {
 		TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook();
-		shutdownHook.enableShutdowHookAddition();
+		shutdownHook.enableShutdownHookAddition();
 		assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isFalse();
 		ConfigurableApplicationContext context = new GenericApplicationContext();
 		shutdownHook.registerApplicationContext(context);
@@ -61,7 +61,7 @@ class SpringApplicationShutdownHookTests {
 	@Test
 	void shutdownHookIsNotAddedUntilHandlerIsRegistered() {
 		TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook();
-		shutdownHook.enableShutdowHookAddition();
+		shutdownHook.enableShutdownHookAddition();
 		assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isFalse();
 		shutdownHook.getHandlers().add(() -> {
 		});
@@ -74,7 +74,7 @@ class SpringApplicationShutdownHookTests {
 		shutdownHook.getHandlers().add(() -> {
 		});
 		assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isFalse();
-		shutdownHook.enableShutdowHookAddition();
+		shutdownHook.enableShutdownHookAddition();
 		shutdownHook.getHandlers().add(() -> {
 		});
 		assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isTrue();