diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java index 29f52a6157..004c5ab9b4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java @@ -46,14 +46,14 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage public class BackgroundPreinitializer implements ApplicationListener { - private static final AtomicBoolean preinitalizationStarted = new AtomicBoolean(false); + private static final AtomicBoolean preinitializationStarted = new AtomicBoolean(false); private static final CountDownLatch preinitializationComplete = new CountDownLatch(1); @Override public void onApplicationEvent(SpringApplicationEvent event) { if (event instanceof ApplicationEnvironmentPreparedEvent) { - if (preinitalizationStarted.compareAndSet(false, true)) { + if (preinitializationStarted.compareAndSet(false, true)) { performPreinitialization(); } } diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 32d9523d3a..8e8df5a882 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -444,7 +444,7 @@ then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push yo Spring Boot app into that slot from the command line or CI build. App Engine needs you to create an `app.yaml` file to describe the resources your app -requires. Normally you put this in `src/min/appengine`, and it looks something like this: +requires. Normally you put this in `src/main/appengine`, and it looks something like this: [source,yaml,indent=0] ---- diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 8438db7fc4..2083888b9b 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -804,7 +804,7 @@ rewriting classes as they are loaded to make them more amenable to reloading. ==== Excluding resources Certain resources don't necessarily need to trigger a restart when they are changed. For example, Thymeleaf templates can just be edited in-place. By default changing resources -in `/META-INF/maven`, `/META-INF/resources` ,`/resources` ,`/static` ,`/public` or +in `/META-INF/maven`, `/META-INF/resources`, `/resources`, `/static`, `/public` or `/templates` will not trigger a restart but will trigger a <>. If you want to customize these exclusions you can use the `spring.devtools.restart.exclude` property. For example, to exclude only diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java index c070559f42..1dfe8fbbe0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java @@ -35,7 +35,7 @@ import org.springframework.util.StringUtils; *

* List shortcuts (names that end with double underscore) are also supported by this * mapper. For example, "{@code MY_LIST__=a,b,c}" is mapped to "{@code my.list[0]=a}", - * "{@code my.list[1]=b}" ,"{@code my.list[2]=c}". + * "{@code my.list[1]=b}", "{@code my.list[2]=c}". * * @author Phillip Webb * @author Madhura Bhave diff --git a/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java b/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java index 0a93bd7179..ae9eea6e42 100644 --- a/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java @@ -29,7 +29,7 @@ import org.springframework.util.ConcurrentReferenceHashMap; /** * Caching implementation of the {@link MetadataReaderFactory} interface backed by a - * {@link ConcurrentReferenceHashMap} , caching {@link MetadataReader} per Spring + * {@link ConcurrentReferenceHashMap}, caching {@link MetadataReader} per Spring * {@link Resource} handle (i.e. per ".class" file). * * @author Phillip Webb diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java index 8fddf0d2ce..43d592469e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java @@ -44,7 +44,7 @@ public class UnboundElementsSourceFilterTests { } @Test - public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse() + public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnFalse() throws Exception { MockPropertySource propertySource = new MockPropertySource( StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME); @@ -53,7 +53,7 @@ public class UnboundElementsSourceFilterTests { } @Test - public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnTrue() + public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse() throws Exception { MockPropertySource propertySource = new MockPropertySource( StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME);