From 70d561a929caf0f01af29c5a45d9164bc6e3e090 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 9 Feb 2023 23:35:20 +0900 Subject: [PATCH] Polish "Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools" See gh-34140 --- .../reactor/netty/ReactorNettyConfigurations.java | 4 ++-- ...igurationProperties.java => ReactorNettyProperties.java} | 6 +++--- .../boot/devtools/env/devtools-property-defaults.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/{ReactorNettyConfigurationProperties.java => ReactorNettyProperties.java} (86%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurations.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurations.java index 64246cb36f3..b6e3ba35480 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurations.java +++ b/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()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurationProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java similarity index 86% rename from spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurationProperties.java rename to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java index b7e68516a61..4f085113c51 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurationProperties.java +++ b/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; diff --git a/spring-boot-project/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/env/devtools-property-defaults.properties b/spring-boot-project/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/env/devtools-property-defaults.properties index c6913287099..6d4f3416cc2 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/env/devtools-property-defaults.properties +++ b/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