Merge pull request #25266 from izeye

* pr/25266:
  Update copyright of changes files
  Polish

Closes gh-25266
pull/25507/head
Stephane Nicoll 4 years ago
commit 659ecd0d05

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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) -> {

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

@ -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.
@ -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`.

Loading…
Cancel
Save