Merge branch '2.1.x'

Closes gh-17079

Author: wilkinsona

pom.xml

@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.9</spring-javaformat.version>
+				<spring-javaformat.version>0.0.11</spring-javaformat.version>
 				<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 			</properties>
 			<build>

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -40,15 +40,13 @@ public abstract class OnEndpointElementCondition extends SpringBootCondition {
 
 	private final Class<? extends Annotation> annotationType;
 
-	protected OnEndpointElementCondition(String prefix,
-			Class<? extends Annotation> annotationType) {
+	protected OnEndpointElementCondition(String prefix, Class<? extends Annotation> annotationType) {
 		this.prefix = prefix;
 		this.annotationType = annotationType;
 	}
 
 	@Override
-	public ConditionOutcome getMatchOutcome(ConditionContext context,
-			AnnotatedTypeMetadata metadata) {
+	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		AnnotationAttributes annotationAttributes = AnnotationAttributes
 				.fromMap(metadata.getAnnotationAttributes(this.annotationType.getName()));
 		String endpointName = annotationAttributes.getString("value");
@@ -59,25 +57,21 @@ public ConditionOutcome getMatchOutcome(ConditionContext context,
 		return getDefaultEndpointsOutcome(context);
 	}
 
-	protected ConditionOutcome getEndpointOutcome(ConditionContext context,
-			String endpointName) {
+	protected ConditionOutcome getEndpointOutcome(ConditionContext context, String endpointName) {
 		Environment environment = context.getEnvironment();
 		String enabledProperty = this.prefix + endpointName + ".enabled";
 		if (environment.containsProperty(enabledProperty)) {
 			boolean match = environment.getProperty(enabledProperty, Boolean.class, true);
-			return new ConditionOutcome(match,
-					ConditionMessage.forCondition(this.annotationType).because(
-							this.prefix + endpointName + ".enabled is " + match));
+			return new ConditionOutcome(match, ConditionMessage.forCondition(this.annotationType)
+					.because(this.prefix + endpointName + ".enabled is " + match));
 		}
 		return null;
 	}
 
 	protected ConditionOutcome getDefaultEndpointsOutcome(ConditionContext context) {
-		boolean match = Boolean.valueOf(context.getEnvironment()
-				.getProperty(this.prefix + "defaults.enabled", "true"));
-		return new ConditionOutcome(match,
-				ConditionMessage.forCondition(this.annotationType).because(
-						this.prefix + "defaults.enabled is considered " + match));
+		boolean match = Boolean.valueOf(context.getEnvironment().getProperty(this.prefix + "defaults.enabled", "true"));
+		return new ConditionOutcome(match, ConditionMessage.forCondition(this.annotationType)
+				.because(this.prefix + "defaults.enabled is considered " + match));
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java

@@ -46,13 +46,12 @@
 @ConditionalOnEnabledHealthIndicator("rabbit")
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
 @AutoConfigureAfter(RabbitAutoConfiguration.class)
-public class RabbitHealthIndicatorAutoConfiguration extends
-		CompositeHealthIndicatorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
+public class RabbitHealthIndicatorAutoConfiguration
+		extends CompositeHealthIndicatorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
 
 	@Bean
 	@ConditionalOnMissingBean(name = "rabbitHealthIndicator")
-	public HealthIndicator rabbitHealthIndicator(
-			Map<String, RabbitTemplate> rabbitTemplates) {
+	public HealthIndicator rabbitHealthIndicator(Map<String, RabbitTemplate> rabbitTemplates) {
 		return createHealthIndicator(rabbitTemplates);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java

@@ -41,8 +41,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(AuditEventRepository.class)
-@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled",
-		matchIfMissing = true)
+@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled", matchIfMissing = true)
 public class AuditAutoConfiguration {
 
 	@Bean
@@ -52,16 +51,14 @@ public AuditListener auditListener(AuditEventRepository auditEventRepository) {
 	}
 
 	@Bean
-	@ConditionalOnClass(
-			name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
+	@ConditionalOnClass(name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
 	@ConditionalOnMissingBean(AbstractAuthenticationAuditListener.class)
 	public AuthenticationAuditListener authenticationAuditListener() throws Exception {
 		return new AuthenticationAuditListener();
 	}
 
 	@Bean
-	@ConditionalOnClass(
-			name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
+	@ConditionalOnClass(name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
 	@ConditionalOnMissingBean(AbstractAuthorizationAuditListener.class)
 	public AuthorizationAuditListener authorizationAuditListener() throws Exception {
 		return new AuthorizationAuditListener();

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java

@@ -42,8 +42,7 @@ public class AuditEventsEndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(AuditEventRepository.class)
-	public AuditEventsEndpoint auditEventsEndpoint(
-			AuditEventRepository auditEventRepository) {
+	public AuditEventsEndpoint auditEventsEndpoint(AuditEventRepository auditEventRepository) {
 		return new AuditEventsEndpoint(auditEventRepository);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java

@@ -36,8 +36,7 @@ public class BeansEndpointAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public BeansEndpoint beansEndpoint(
-			ConfigurableApplicationContext applicationContext) {
+	public BeansEndpoint beansEndpoint(ConfigurableApplicationContext applicationContext) {
 		return new BeansEndpoint(applicationContext);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java

@@ -53,8 +53,7 @@ public CachesEndpoint cachesEndpoint(Map<String, CacheManager> cacheManagers) {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(CachesEndpoint.class)
-	public CachesEndpointWebExtension cachesEndpointWebExtension(
-			CachesEndpoint cachesEndpoint) {
+	public CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint cachesEndpoint) {
 		return new CachesEndpointWebExtension(cachesEndpoint);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java

@@ -50,16 +50,14 @@
 @ConditionalOnBean(CassandraOperations.class)
 @ConditionalOnEnabledHealthIndicator("cassandra")
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
-@AutoConfigureAfter({ CassandraAutoConfiguration.class,
-		CassandraDataAutoConfiguration.class,
+@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
 		CassandraReactiveHealthIndicatorAutoConfiguration.class })
-public class CassandraHealthIndicatorAutoConfiguration extends
-		CompositeHealthIndicatorConfiguration<CassandraHealthIndicator, CassandraOperations> {
+public class CassandraHealthIndicatorAutoConfiguration
+		extends CompositeHealthIndicatorConfiguration<CassandraHealthIndicator, CassandraOperations> {
 
 	@Bean
 	@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
-	public HealthIndicator cassandraHealthIndicator(
-			Map<String, CassandraOperations> cassandraOperations) {
+	public HealthIndicator cassandraHealthIndicator(Map<String, CassandraOperations> cassandraOperations) {
 		return createHealthIndicator(cassandraOperations);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryAuthorizationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -32,8 +32,7 @@ public CloudFoundryAuthorizationException(Reason reason, String message) {
 		this(reason, message, null);
 	}
 
-	public CloudFoundryAuthorizationException(Reason reason, String message,
-			Throwable cause) {
+	public CloudFoundryAuthorizationException(Reason reason, String message, Throwable cause) {
 		super(message, cause);
 		this.reason = reason;
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscoverer.java

@@ -50,33 +50,29 @@ public class CloudFoundryWebEndpointDiscoverer extends WebEndpointDiscoverer {
 	 * @param filters filters to apply
 	 */
 	public CloudFoundryWebEndpointDiscoverer(ApplicationContext applicationContext,
-			ParameterValueMapper parameterValueMapper,
-			EndpointMediaTypes endpointMediaTypes, List<PathMapper> endpointPathMappers,
-			Collection<OperationInvokerAdvisor> invokerAdvisors,
+			ParameterValueMapper parameterValueMapper, EndpointMediaTypes endpointMediaTypes,
+			List<PathMapper> endpointPathMappers, Collection<OperationInvokerAdvisor> invokerAdvisors,
 			Collection<EndpointFilter<ExposableWebEndpoint>> filters) {
-		super(applicationContext, parameterValueMapper, endpointMediaTypes,
-				endpointPathMappers, invokerAdvisors, filters);
+		super(applicationContext, parameterValueMapper, endpointMediaTypes, endpointPathMappers, invokerAdvisors,
+				filters);
 	}
 
 	@Override
 	protected boolean isExtensionExposed(Object extensionBean) {
-		if (isHealthEndpointExtension(extensionBean)
-				&& !isCloudFoundryHealthEndpointExtension(extensionBean)) {
+		if (isHealthEndpointExtension(extensionBean) && !isCloudFoundryHealthEndpointExtension(extensionBean)) {
 			// Filter regular health endpoint extensions so a CF version can replace them
 			return false;
 		}
 		return true;
 	}
 
 	private boolean isHealthEndpointExtension(Object extensionBean) {
-		return MergedAnnotations.from(extensionBean.getClass())
-				.get(EndpointWebExtension.class).getValue("endpoint", Class.class)
-				.map(HealthEndpoint.class::isAssignableFrom).orElse(false);
+		return MergedAnnotations.from(extensionBean.getClass()).get(EndpointWebExtension.class)
+				.getValue("endpoint", Class.class).map(HealthEndpoint.class::isAssignableFrom).orElse(false);
 	}
 
 	private boolean isCloudFoundryHealthEndpointExtension(Object extensionBean) {
-		return MergedAnnotations.from(extensionBean.getClass())
-				.isPresent(EndpointCloudFoundryExtension.class);
+		return MergedAnnotations.from(extensionBean.getClass()).isPresent(EndpointCloudFoundryExtension.class);
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -61,12 +61,10 @@ public Token(String encoded) {
 	private Map<String, Object> parseJson(String base64) {
 		try {
 			byte[] bytes = Base64Utils.decodeFromUrlSafeString(base64);
-			return JsonParserFactory.getJsonParser()
-					.parseMap(new String(bytes, StandardCharsets.UTF_8));
+			return JsonParserFactory.getJsonParser().parseMap(new String(bytes, StandardCharsets.UTF_8));
 		}
 		catch (RuntimeException ex) {
-			throw new CloudFoundryAuthorizationException(Reason.INVALID_TOKEN,
-					"Token could not be parsed", ex);
+			throw new CloudFoundryAuthorizationException(Reason.INVALID_TOKEN, "Token could not be parsed", ex);
 		}
 	}
 
@@ -103,8 +101,7 @@ public String getKeyId() {
 	private <T> T getRequired(Map<String, Object> map, String key, Class<T> type) {
 		Object value = map.get(key);
 		if (value == null) {
-			throw new CloudFoundryAuthorizationException(Reason.INVALID_TOKEN,
-					"Unable to get value from key " + key);
+			throw new CloudFoundryAuthorizationException(Reason.INVALID_TOKEN, "Unable to get value from key " + key);
 		}
 		if (!type.isInstance(value)) {
 			throw new CloudFoundryAuthorizationException(Reason.INVALID_TOKEN,

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtension.java

@@ -39,8 +39,7 @@ public class CloudFoundryReactiveHealthEndpointWebExtension {
 
 	private final ReactiveHealthEndpointWebExtension delegate;
 
-	public CloudFoundryReactiveHealthEndpointWebExtension(
-			ReactiveHealthEndpointWebExtension delegate) {
+	public CloudFoundryReactiveHealthEndpointWebExtension(ReactiveHealthEndpointWebExtension delegate) {
 		this.delegate = delegate;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundrySecurityInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -39,21 +39,18 @@
  */
 class CloudFoundrySecurityInterceptor {
 
-	private static final Log logger = LogFactory
-			.getLog(CloudFoundrySecurityInterceptor.class);
+	private static final Log logger = LogFactory.getLog(CloudFoundrySecurityInterceptor.class);
 
 	private final ReactiveTokenValidator tokenValidator;
 
 	private final ReactiveCloudFoundrySecurityService cloudFoundrySecurityService;
 
 	private final String applicationId;
 
-	private static final Mono<SecurityResponse> SUCCESS = Mono
-			.just(SecurityResponse.success());
+	private static final Mono<SecurityResponse> SUCCESS = Mono.just(SecurityResponse.success());
 
 	CloudFoundrySecurityInterceptor(ReactiveTokenValidator tokenValidator,
-			ReactiveCloudFoundrySecurityService cloudFoundrySecurityService,
-			String applicationId) {
+			ReactiveCloudFoundrySecurityService cloudFoundrySecurityService, String applicationId) {
 		this.tokenValidator = tokenValidator;
 		this.cloudFoundrySecurityService = cloudFoundrySecurityService;
 		this.applicationId = applicationId;
@@ -65,15 +62,14 @@ Mono<SecurityResponse> preHandle(ServerWebExchange exchange, String id) {
 			return SUCCESS;
 		}
 		if (!StringUtils.hasText(this.applicationId)) {
-			return Mono.error(new CloudFoundryAuthorizationException(
-					Reason.SERVICE_UNAVAILABLE, "Application id is not available"));
+			return Mono.error(new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,
+					"Application id is not available"));
 		}
 		if (this.cloudFoundrySecurityService == null) {
-			return Mono.error(new CloudFoundryAuthorizationException(
-					Reason.SERVICE_UNAVAILABLE, "Cloud controller URL is not available"));
+			return Mono.error(new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,
+					"Cloud controller URL is not available"));
 		}
-		return check(exchange, id).then(SUCCESS).doOnError(this::logError)
-				.onErrorResume(this::getErrorResponse);
+		return check(exchange, id).then(SUCCESS).doOnError(this::logError).onErrorResume(this::getErrorResponse);
 	}
 
 	private void logError(Throwable ex) {
@@ -84,13 +80,11 @@ private Mono<Void> check(ServerWebExchange exchange, String id) {
 		try {
 			Token token = getToken(exchange.getRequest());
 			return this.tokenValidator.validate(token)
-					.then(this.cloudFoundrySecurityService
-							.getAccessLevel(token.toString(), this.applicationId))
+					.then(this.cloudFoundrySecurityService.getAccessLevel(token.toString(), this.applicationId))
 					.filter((accessLevel) -> accessLevel.isAccessAllowed(id))
-					.switchIfEmpty(Mono.error(new CloudFoundryAuthorizationException(
-							Reason.ACCESS_DENIED, "Access denied")))
-					.doOnSuccess((accessLevel) -> exchange.getAttributes()
-							.put("cloudFoundryAccessLevel", accessLevel))
+					.switchIfEmpty(
+							Mono.error(new CloudFoundryAuthorizationException(Reason.ACCESS_DENIED, "Access denied")))
+					.doOnSuccess((accessLevel) -> exchange.getAttributes().put("cloudFoundryAccessLevel", accessLevel))
 					.then();
 		}
 		catch (CloudFoundryAuthorizationException ex) {
@@ -104,15 +98,13 @@ private Mono<SecurityResponse> getErrorResponse(Throwable throwable) {
 			return Mono.just(new SecurityResponse(cfException.getStatusCode(),
 					"{\"security_error\":\"" + cfException.getMessage() + "\"}"));
 		}
-		return Mono.just(new SecurityResponse(HttpStatus.INTERNAL_SERVER_ERROR,
-				throwable.getMessage()));
+		return Mono.just(new SecurityResponse(HttpStatus.INTERNAL_SERVER_ERROR, throwable.getMessage()));
 	}
 
 	private Token getToken(ServerHttpRequest request) {
 		String authorization = request.getHeaders().getFirst("Authorization");
 		String bearerPrefix = "bearer ";
-		if (authorization == null
-				|| !authorization.toLowerCase(Locale.ENGLISH).startsWith(bearerPrefix)) {
+		if (authorization == null || !authorization.toLowerCase(Locale.ENGLISH).startsWith(bearerPrefix)) {
 			throw new CloudFoundryAuthorizationException(Reason.MISSING_AUTHORIZATION,
 					"Authorization header is missing or invalid");
 		}