Merge branch '2.7.x' into 3.0.x

Closes gh-34184

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurations.java

@@ -35,12 +35,12 @@ public final class ReactorNettyConfigurations {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@EnableConfigurationProperties(ReactorNettyConfigurationProperties.class)
+	@EnableConfigurationProperties(ReactorNettyProperties.class)
 	public static class ReactorResourceFactoryConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
-		ReactorResourceFactory reactorResourceFactory(ReactorNettyConfigurationProperties configurationProperties) {
+		ReactorResourceFactory reactorResourceFactory(ReactorNettyProperties configurationProperties) {
 			ReactorResourceFactory reactorResourceFactory = new ReactorResourceFactory();
 			if (configurationProperties.getShutdownQuietPeriod() != null) {
 				reactorResourceFactory.setShutdownQuietPeriod(configurationProperties.getShutdownQuietPeriod());

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java

@@ -21,16 +21,16 @@ import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Configuration properties for Reactor Netty configuration.
+ * Configuration properties for Reactor Netty.
  *
  * @author Moritz Halbritter
  * @since 2.7.9
  */
 @ConfigurationProperties(prefix = "spring.reactor.netty")
-public class ReactorNettyConfigurationProperties {
+public class ReactorNettyProperties {
 
 	/**
-	 * Configure the amount of time to wait before shutting down resources.
+	 * Amount of time to wait before shutting down resources.
 	 */
 	private Duration shutdownQuietPeriod;
 

spring-boot-project/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/env/devtools-property-defaults.properties

@@ -9,8 +9,8 @@ spring.groovy.template.cache=false
 spring.h2.console.enabled=true
 spring.mustache.servlet.cache=false
 spring.mvc.log-resolved-exception=true
+spring.reactor.netty.shutdown-quiet-period=0s
 spring.template.provider.cache=false
 spring.thymeleaf.cache=false
 spring.web.resources.cache.period=0
 spring.web.resources.chain.cache=false
-spring.reactor.netty.shutdown-quiet-period=0s