Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java

@@ -26,6 +26,7 @@ import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.security.IgnoredRequestCustomizer;
@@ -98,18 +99,27 @@ public class CloudFoundryActuatorAutoConfiguration {
 		return corsConfiguration;
 	}
 
-	@Bean
-	public IgnoredRequestCustomizer cloudFoundryIgnoredRequestCustomizer() {
-		return new CloudFoundryIgnoredRequestCustomizer();
-	}
+	/**
+	 * Nested configuration for ignored requests if Spring Security is present.
+	 *
+	 */
+	@ConditionalOnClass(WebSecurity.class)
+	static class CloudFoundryIgnoredRequestConfiguration {
 
-	private class CloudFoundryIgnoredRequestCustomizer
-			implements IgnoredRequestCustomizer {
+		@Bean
+		public IgnoredRequestCustomizer cloudFoundryIgnoredRequestCustomizer() {
+			return new CloudFoundryIgnoredRequestCustomizer();
+		}
+
+		private static class CloudFoundryIgnoredRequestCustomizer
+				implements IgnoredRequestCustomizer {
+
+			@Override
+			public void customize(WebSecurity.IgnoredRequestConfigurer configurer) {
+				configurer.requestMatchers(
+						new AntPathRequestMatcher("/cloudfoundryapplication/**"));
+			}
 
-		@Override
-		public void customize(WebSecurity.IgnoredRequestConfigurer configurer) {
-			configurer.requestMatchers(
-					new AntPathRequestMatcher("/cloudfoundryapplication/**"));
 		}
 
 	}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java

@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint;
 import java.util.Collections;
 import java.util.Map;
 
+import org.junit.After;
 import org.junit.Test;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -45,6 +46,12 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests<EnvironmentE
 		super(Config.class, EnvironmentEndpoint.class, "env", true, "endpoints.env");
 	}
 
+	@Override
+	@After
+	public void close() {
+		System.clearProperty("VCAP_SERVICES");
+	}
+
 	@Test
 	public void invoke() throws Exception {
 		assertThat(getEndpointBean().invoke()).isNotEmpty();