Merge branch '1.5.x'

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -69,8 +69,12 @@ public long getTimeToLive() {
 		return this.timeToLive;
 	}
 
-	public void setTimeToLive(long ttl) {
-		this.timeToLive = ttl;
+	/**
+	 * Set the time to live for cached results.
+	 * @param timeToLive the time to live in milliseconds
+	 */
+	public void setTimeToLive(long timeToLive) {
+		this.timeToLive = timeToLive;
 	}
 
 	/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java

@@ -171,20 +171,13 @@ private Health getHealth(HttpServletRequest request, Principal principal) {
 
 	private Health getCurrentHealth() {
 		long accessTime = System.currentTimeMillis();
-		CachedHealth cachedHealth = this.cachedHealth;
-		if (isStale(cachedHealth, accessTime)) {
+		CachedHealth cached = this.cachedHealth;
+		if (cached == null || cached.isStale(accessTime, getDelegate().getTimeToLive())) {
 			Health health = getDelegate().invoke();
 			this.cachedHealth = new CachedHealth(health, accessTime);
 			return health;
 		}
-		return cachedHealth.health;
-	}
-
-	private boolean isStale(CachedHealth cachedHealth, long accessTime) {
-		if (cachedHealth == null) {
-			return true;
-		}
-		return (accessTime - cachedHealth.creationTime) >= getDelegate().getTimeToLive();
+		return cached.getHealth();
 	}
 
 	protected boolean exposeHealthDetails(HttpServletRequest request,
@@ -234,6 +227,14 @@ static class CachedHealth {
 			this.creationTime = creationTime;
 		}
 
+		public boolean isStale(long accessTime, long timeToLive) {
+			return (accessTime - this.creationTime) >= timeToLive;
+		}
+
+		public Health getHealth() {
+			return this.health;
+		}
+
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java

@@ -106,8 +106,8 @@ protected static class ClientContextConfiguration {
 
 			private final AccessTokenRequest accessTokenRequest;
 
-			public ClientContextConfiguration(@Qualifier("accessTokenRequest")
-					ObjectProvider<AccessTokenRequest> accessTokenRequest) {
+			public ClientContextConfiguration(
+					@Qualifier("accessTokenRequest") ObjectProvider<AccessTokenRequest> accessTokenRequest) {
 				this.accessTokenRequest = accessTokenRequest.getIfAvailable();
 			}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java

@@ -92,7 +92,7 @@ private String[] appendSlashIfNecessary(String[] staticLocations) {
 		String[] normalized = new String[staticLocations.length];
 		for (int i = 0; i < staticLocations.length; i++) {
 			String location = staticLocations[i];
-			normalized[i] = location.endsWith("/") ? location : location + "/";
+			normalized[i] = (location.endsWith("/") ? location : location + "/");
 		}
 		return normalized;
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java

@@ -76,7 +76,8 @@ public void httpsUriUseHttpDriver() {
 		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=https://localhost:7474");
 		Configuration configuration = properties.createConfiguration();
-		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "https://localhost:7474");
+		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
+				"https://localhost:7474");
 	}
 
 	@Test

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java

@@ -47,13 +47,18 @@ public class OAuth2RestOperationsConfigurationTests {
 	public void clientIdConditionMatches() throws Exception {
 		EnvironmentTestUtils.addEnvironment(this.environment,
 				"security.oauth2.client.client-id=acme");
-		this.context = new SpringApplicationBuilder(OAuth2RestOperationsConfiguration.class).environment(this.environment).web(false).run();
-		assertThat(this.context.getBean(OAuth2RestOperationsConfiguration.class)).isNotNull();
+		this.context = new SpringApplicationBuilder(
+				OAuth2RestOperationsConfiguration.class).environment(this.environment)
+						.web(false).run();
+		assertThat(this.context.getBean(OAuth2RestOperationsConfiguration.class))
+				.isNotNull();
 	}
 
 	@Test
 	public void clientIdConditionDoesNotMatch() throws Exception {
-		this.context = new SpringApplicationBuilder(OAuth2RestOperationsConfiguration.class).environment(this.environment).web(false).run();
+		this.context = new SpringApplicationBuilder(
+				OAuth2RestOperationsConfiguration.class).environment(this.environment)
+						.web(false).run();
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(OAuth2RestOperationsConfiguration.class);
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java

@@ -63,9 +63,8 @@ public void defaultStaticLocationsAllEndWithTrailingSlash() {
 	@Test
 	public void customStaticLocationsAreNormalizedToEndWithTrailingSlash() {
 		this.properties.setStaticLocations(new String[] { "/foo", "/bar", "/baz/" });
-		assertThat(this.properties.getStaticLocations()).containsExactly("/foo/", "/bar/",
-				"/baz/");
-
+		String[] actual = this.properties.getStaticLocations();
+		assertThat(actual).containsExactly("/foo/", "/bar/", "/baz/");
 	}
 
 }

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java

@@ -22,7 +22,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -208,21 +207,27 @@ private static class ResourcePatternResolverFactory {
 
 		public ResourcePatternResolver getResourcePatternResolver(
 				ApplicationContext applicationContext, ResourceLoader resourceLoader) {
-			return new PathMatchingResourcePatternResolver(resourceLoader == null
-					? createResourceLoader(applicationContext) : resourceLoader);
+			if (resourceLoader == null) {
+				resourceLoader = new DefaultResourceLoader();
+				copyProtocolResolvers(applicationContext, resourceLoader);
+			}
+			return new PathMatchingResourcePatternResolver(resourceLoader);
 		}
 
-		private ResourceLoader createResourceLoader(
-				ApplicationContext applicationContext) {
-			DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
-			if (applicationContext instanceof DefaultResourceLoader) {
-				Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
-						.getProtocolResolvers();
-				for (ProtocolResolver protocolResolver : protocolResolvers) {
-					resourceLoader.addProtocolResolver(protocolResolver);
-				}
+		protected final void copyProtocolResolvers(ApplicationContext applicationContext,
+				ResourceLoader resourceLoader) {
+			if (applicationContext instanceof DefaultResourceLoader
+					&& resourceLoader instanceof DefaultResourceLoader) {
+				copyProtocolResolvers((DefaultResourceLoader) applicationContext,
+						(DefaultResourceLoader) resourceLoader);
+			}
+		}
+
+		protected final void copyProtocolResolvers(DefaultResourceLoader source,
+				DefaultResourceLoader destination) {
+			for (ProtocolResolver resolver : source.getProtocolResolvers()) {
+				destination.addProtocolResolver(resolver);
 			}
-			return resourceLoader;
 		}
 
 	}
@@ -238,25 +243,21 @@ private static class WebResourcePatternResolverFactory
 		public ResourcePatternResolver getResourcePatternResolver(
 				ApplicationContext applicationContext, ResourceLoader resourceLoader) {
 			if (applicationContext instanceof WebApplicationContext) {
-				return new ServletContextResourcePatternResolver(resourceLoader == null
-						? createResourceLoader((WebApplicationContext) applicationContext)
-						: resourceLoader);
+				return getResourcePatternResolver(
+						(WebApplicationContext) applicationContext, resourceLoader);
 			}
 			return super.getResourcePatternResolver(applicationContext, resourceLoader);
 		}
 
-		private ResourceLoader createResourceLoader(
-				WebApplicationContext applicationContext) {
-			WebApplicationContextResourceLoader resourceLoader = new WebApplicationContextResourceLoader(
-					applicationContext);
-			if (applicationContext instanceof DefaultResourceLoader) {
-				Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
-						.getProtocolResolvers();
-				for (ProtocolResolver protocolResolver : protocolResolvers) {
-					resourceLoader.addProtocolResolver(protocolResolver);
-				}
+		private ResourcePatternResolver getResourcePatternResolver(
+				WebApplicationContext applicationContext, ResourceLoader resourceLoader) {
+			if (resourceLoader == null) {
+				resourceLoader = new WebApplicationContextResourceLoader(
+						applicationContext);
+				copyProtocolResolvers(applicationContext, resourceLoader);
 			}
-			return resourceLoader;
+			return new ServletContextResourcePatternResolver(resourceLoader);
+
 		}
 
 	}

spring-boot-docs/src/main/asciidoc/deployment.adoc

@@ -433,65 +433,64 @@ Maven build to run the app.
 
 [[cloud-deployment-gae]]
 === Google Cloud
-
-Google Cloud has several options that could be used to launch Spring Boot applications. The
-easiest to get started with is probably App Engine, but you could also find ways to run
-Spring Boot in a container with Container Engine, or on a virtual machine using Compute Engine.
-
-To run in App Engine you can create a project in the UI first, which
-sets up a unique identifier for you and also HTTP routes. Add a Java
-app to the project and leave it empty, then use the
-https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push your
+Google Cloud has several options that could be used to launch Spring Boot applications.
+The easiest to get started with is probably App Engine, but you could also find ways to
+run Spring Boot in a container with Container Engine, or on a virtual machine using
+Compute Engine.
+
+To run in App Engine you can create a project in the UI first, which sets up a unique
+identifier for you and also HTTP routes. Add a Java app to the project and leave it empty,
+then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push your
 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:
+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:
 
 [source,yaml,indent=0]
 ----
-service: default
+	service: default
 
-runtime: java
-env: flex
+	runtime: java
+	env: flex
 
-runtime_config:
-  jdk: openjdk8
+	runtime_config:
+	  jdk: openjdk8
 
-handlers:
-- url: /.*
-  script: this field is required, but ignored
+	handlers:
+	- url: /.*
+	  script: this field is required, but ignored
 
-manual_scaling:
-  instances: 1
+	manual_scaling:
+	  instances: 1
 
-health_check:
-  enable_health_check: False
+	health_check:
+	  enable_health_check: False
 
-env_variables:
-  ENCRYPT_KEY: your_encryption_key_here
+	env_variables:
+	  ENCRYPT_KEY: your_encryption_key_here
 ----
 
-You can deploy the app, for example, with a Maven plugin by simply
-adding the project ID to the build configuration:
+You can deploy the app, for example, with a Maven plugin by simply adding the project ID
+to the build configuration:
 
 [source,xml,indent=0,subs="verbatim,quotes,attributes"]
 ----
-			<plugin>
-                <groupId>com.google.cloud.tools</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>1.3.0</version>
-                <configuration>
-                    <project>myproject</project>
-                </configuration>
-            </plugin>
+	<plugin>
+		<groupId>com.google.cloud.tools</groupId>
+		<artifactId>appengine-maven-plugin</artifactId>
+		<version>1.3.0</version>
+		<configuration>
+			<project>myproject</project>
+		</configuration>
+	</plugin>
 ----
 
-Then deploy with `mvn appengine:deploy` (if you need to authenticate first the build will fail).
+Then deploy with `mvn appengine:deploy` (if you need to authenticate first the build will
+fail).
 
-NOTE: Google App Engine Classic is tied to the Servlet 2.5 API, so you can't deploy a Spring Application
-there without some modifications. See the <<howto.adoc#howto-servlet-2-5, Servlet 2.5 section>>
-of this guide.
+NOTE: Google App Engine Classic is tied to the Servlet 2.5 API, so you can't deploy a
+Spring Application there without some modifications. See the
+<<howto.adoc#howto-servlet-2-5, Servlet 2.5 section>> of this guide.
 
 
 

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -137,6 +137,7 @@ key defined via `@PropertySource` will be loaded too late to have any effect on
 auto-configuration.
 
 
+
 [[howto-build-an-application-context-hierarchy]]
 === Build an ApplicationContext hierarchy (adding a parent or root context)
 You can use the `ApplicationBuilder` class to create parent/child `ApplicationContext`