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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-08-03 21:23:20 +01:00
parent 09b41a33e8 1f37da5b06
commit 5c06bd5ab9
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View File

@ -46,14 +46,14 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
public class BackgroundPreinitializer public class BackgroundPreinitializer
implements ApplicationListener<SpringApplicationEvent> { implements ApplicationListener<SpringApplicationEvent> {
private static final AtomicBoolean preinitalizationStarted = new AtomicBoolean(false); private static final AtomicBoolean preinitializationStarted = new AtomicBoolean(false);
private static final CountDownLatch preinitializationComplete = new CountDownLatch(1); private static final CountDownLatch preinitializationComplete = new CountDownLatch(1);
@Override @Override
public void onApplicationEvent(SpringApplicationEvent event) { public void onApplicationEvent(SpringApplicationEvent event) {
if (event instanceof ApplicationEnvironmentPreparedEvent) { if (event instanceof ApplicationEnvironmentPreparedEvent) {
if (preinitalizationStarted.compareAndSet(false, true)) { if (preinitializationStarted.compareAndSet(false, true)) {
performPreinitialization(); performPreinitialization();
} }
} }

2
spring-boot-docs/src/main/asciidoc/deployment.adoc
View File

@ -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. 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 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] [source,yaml,indent=0]
---- ----

2
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View File

@ -804,7 +804,7 @@ rewriting classes as they are loaded to make them more amenable to reloading.
==== Excluding resources ==== Excluding resources
Certain resources don't necessarily need to trigger a restart when they are changed. For 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 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 `/templates` will not trigger a restart but will trigger a
<<using-boot-devtools-livereload, live reload>>. If you want to customize these exclusions <<using-boot-devtools-livereload, live reload>>. If you want to customize these exclusions
you can use the `spring.devtools.restart.exclude` property. For example, to exclude only you can use the `spring.devtools.restart.exclude` property. For example, to exclude only

2
spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java
View File

@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
* <p> * <p>
* List shortcuts (names that end with double underscore) are also supported by this * 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}", * 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 Phillip Webb
* @author Madhura Bhave * @author Madhura Bhave

2
spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java
View File

@ -29,7 +29,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
/** /**
* Caching implementation of the {@link MetadataReaderFactory} interface backed by a * 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). * {@link Resource} handle (i.e. per ".class" file).
* *
* @author Phillip Webb * @author Phillip Webb

4
spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java
View File

@ -44,7 +44,7 @@ public class UnboundElementsSourceFilterTests {
} }
@Test @Test
public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse() public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnFalse()
throws Exception { throws Exception {
MockPropertySource propertySource = new MockPropertySource( MockPropertySource propertySource = new MockPropertySource(
StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME); StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
@ -53,7 +53,7 @@ public class UnboundElementsSourceFilterTests {
} }
@Test @Test
public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnTrue() public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse()
throws Exception { throws Exception {
MockPropertySource propertySource = new MockPropertySource( MockPropertySource propertySource = new MockPropertySource(
StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME); StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME);