root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-34185
This commit is contained in:
Andy Wilkinson 2023-02-14 20:02:18 +00:00
parent 6e9d94edb1 68f97f5361
commit 537e5e920f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyConfigurationProperties.java → spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java
View File

@ -21,16 +21,16 @@ import java.time.Duration;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
* Configuration properties for Reactor Netty configuration. * Configuration properties for Reactor Netty.
* *
* @author Moritz Halbritter * @author Moritz Halbritter
* @since 2.7.9 * @since 2.7.9
*/ */
@ConfigurationProperties(prefix = "spring.reactor.netty") @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; private Duration shutdownQuietPeriod;

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

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