This commit is contained in:
izeye 2021-02-13 23:18:27 +09:00 committed by Stephane Nicoll
parent 3471adcf09
commit f48893def5
3 changed files with 7 additions and 7 deletions

View File

@ -47,7 +47,7 @@ public class LifecycleAutoConfigurationTests {
} }
@Test @Test
void lifecycleProcessorIsConfiguredWithCustomDefaultTimeout() { void lifecycleProcessorIsConfiguredWithCustomTimeout() {
this.contextRunner.withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s").run((context) -> { this.contextRunner.withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s").run((context) -> {
assertThat(context).hasBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME); assertThat(context).hasBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME);
Object processor = context.getBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME); Object processor = context.getBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME);
@ -56,7 +56,7 @@ public class LifecycleAutoConfigurationTests {
} }
@Test @Test
void lifecycleProcessorIsConfiguredWithCustomDefaultTimeoutInAChildContext() { void lifecycleProcessorIsConfiguredWithCustomTimeoutInAChildContext() {
new ApplicationContextRunner().run((parent) -> { new ApplicationContextRunner().run((parent) -> {
this.contextRunner.withParent(parent).withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s") this.contextRunner.withParent(parent).withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s")
.run((child) -> { .run((child) -> {

View File

@ -21,7 +21,7 @@ import org.springframework.boot.devtools.filewatch.ChangedFile;
/** /**
* Strategy interface used to determine when a changed classpath file should trigger a * Strategy interface used to determine when a changed classpath file should trigger a
* full application restart. For example, static web resources might not require a full * full application restart. For example, static web resources might not require a full
* restart where as class files would. * restart whereas class files would.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.3.0 * @since 1.3.0

View File

@ -597,7 +597,7 @@ This means that the JSON cannot override properties from lower order property so
[[boot-features-external-config-files]] [[boot-features-external-config-files]]
=== External Application Properties [[boot-features-external-config-application-property-files]] === External Application Properties [[boot-features-external-config-application-property-files]]
Spring Boot will automatically find and load `application.properties` and `application.yaml` files from the following locations when your application starts: Spring Boot will automatically find and load `application.properties` and `application.yaml` files from the following locations when your application starts:
. The classpath root . The classpath root
@ -691,7 +691,7 @@ This might result in two separate `application.properties` files mounted at diff
In such a case, having a wildcard location of `config/*/`, will result in both files being processed. In such a case, having a wildcard location of `config/*/`, will result in both files being processed.
By default, Spring Boot includes `config/*/` in the default search locations. By default, Spring Boot includes `config/*/` in the default search locations.
The means that all subdirectories of the `/config` directory outside of your jar will be searched. It means that all subdirectories of the `/config` directory outside of your jar will be searched.
You can use wildcard locations yourself with the `spring.config.location` and `spring.config.additional-location` properties. You can use wildcard locations yourself with the `spring.config.location` and `spring.config.additional-location` properties.
@ -1519,7 +1519,7 @@ The properties above will bind to a `Map` with `/key1`, `/key2` and `key3` as th
The slash has been removed from `key3` because it wasn't surrounded by square brackets. The slash has been removed from `key3` because it wasn't surrounded by square brackets.
You may also occasionally need to use the bracket notation if your `key` contains a `.` and you are binding to non-scalar value. You may also occasionally need to use the bracket notation if your `key` contains a `.` and you are binding to non-scalar value.
For example, binding `a.b=c` to `Map<String, Object>` will return a Map with the entry `{"a"={"b"="c"}}` where as `[a.b]=c` will return a Map with the entry `{"a.b"="c"}`. For example, binding `a.b=c` to `Map<String, Object>` will return a Map with the entry `{"a"={"b"="c"}}` whereas `[a.b]=c` will return a Map with the entry `{"a.b"="c"}`.
@ -2574,7 +2574,7 @@ If you want to take complete control of Spring MVC, you can add your own `@Confi
[NOTE] [NOTE]
==== ====
Spring MVC uses a different `ConversionService` to the one used to convert values from your `application.properties` or `application.yaml` file. Spring MVC uses a different `ConversionService` to the one used to convert values from your `application.properties` or `application.yaml` file.
The means that `Period`, `Duration` and `DataSize` converters are not available and that `@DurationUnit` and `@DataSizeUnit` annotations will be ignored. It means that `Period`, `Duration` and `DataSize` converters are not available and that `@DurationUnit` and `@DataSizeUnit` annotations will be ignored.
If you want to customize the `ConversionService` used by Spring MVC, you can provide a `WebMvcConfigurer` bean with an `addFormatters` method. If you want to customize the `ConversionService` used by Spring MVC, you can provide a `WebMvcConfigurer` bean with an `addFormatters` method.
From this method you can register any converter that you like, or you can delegate to the static methods available on `ApplicationConversionService`. From this method you can register any converter that you like, or you can delegate to the static methods available on `ApplicationConversionService`.