From f48893def5486e3fd23c6142bd6bc4b5efd3e376 Mon Sep 17 00:00:00 2001 From: izeye Date: Sat, 13 Feb 2021 23:18:27 +0900 Subject: [PATCH 1/2] Polish --- .../context/LifecycleAutoConfigurationTests.java | 4 ++-- .../boot/devtools/classpath/ClassPathRestartStrategy.java | 2 +- .../src/docs/asciidoc/spring-boot-features.adoc | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java index f34f7c3999..76b1da26c9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java @@ -47,7 +47,7 @@ public class LifecycleAutoConfigurationTests { } @Test - void lifecycleProcessorIsConfiguredWithCustomDefaultTimeout() { + void lifecycleProcessorIsConfiguredWithCustomTimeout() { this.contextRunner.withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s").run((context) -> { assertThat(context).hasBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME); Object processor = context.getBean(AbstractApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME); @@ -56,7 +56,7 @@ public class LifecycleAutoConfigurationTests { } @Test - void lifecycleProcessorIsConfiguredWithCustomDefaultTimeoutInAChildContext() { + void lifecycleProcessorIsConfiguredWithCustomTimeoutInAChildContext() { new ApplicationContextRunner().run((parent) -> { this.contextRunner.withParent(parent).withPropertyValues("spring.lifecycle.timeout-per-shutdown-phase=15s") .run((child) -> { diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java index 83b43f8b87..1fc892a0e8 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java @@ -21,7 +21,7 @@ import org.springframework.boot.devtools.filewatch.ChangedFile; /** * 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 - * restart where as class files would. + * restart whereas class files would. * * @author Phillip Webb * @since 1.3.0 diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index b10a5b8314..3933cd38a2 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -597,7 +597,7 @@ This means that the JSON cannot override properties from lower order property so [[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: . 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. 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. @@ -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. 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` 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` 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] ==== 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. From this method you can register any converter that you like, or you can delegate to the static methods available on `ApplicationConversionService`. From 61e9d04c685ced9bf4f5122fc3834aed06b7059a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 14 Feb 2021 09:35:36 +0100 Subject: [PATCH 2/2] Update copyright of changes files See gh-25266 --- .../autoconfigure/context/LifecycleAutoConfigurationTests.java | 2 +- .../boot/devtools/classpath/ClassPathRestartStrategy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java index 76b1da26c9..818b7b0224 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/LifecycleAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java index 1fc892a0e8..5faccbabc3 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java @@ -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"); * you may not use this file except in compliance with the License.