Merge branch '2.0.x'

Author: philwebb

pom.xml

@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.3</spring-javaformat.version>
+				<spring-javaformat.version>0.0.6</spring-javaformat.version>
 			</properties>
 			<build>
 				<plugins>
@@ -36,7 +36,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>8.8</version>
+								<version>8.11</version>
 							</dependency>
 							<dependency>
 								<groupId>io.spring.javaformat</groupId>

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

@@ -72,7 +72,7 @@ private boolean isHealthEndpointExtension(Object extensionBean) {
 		AnnotationAttributes attributes = AnnotatedElementUtils
 				.getMergedAnnotationAttributes(extensionBean.getClass(),
 						EndpointWebExtension.class);
-		Class<?> endpoint = (attributes != null ? attributes.getClass("endpoint") : null);
+		Class<?> endpoint = (attributes != null) ? attributes.getClass("endpoint") : null;
 		return (endpoint != null && HealthEndpoint.class.isAssignableFrom(endpoint));
 	}
 

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

@@ -126,8 +126,8 @@ private ReactiveCloudFoundrySecurityService getCloudFoundrySecurityService(
 		String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
 		boolean skipSslValidation = environment.getProperty(
 				"management.cloudfoundry.skip-ssl-validation", Boolean.class, false);
-		return (cloudControllerUrl != null ? new ReactiveCloudFoundrySecurityService(
-				webClientBuilder, cloudControllerUrl, skipSslValidation) : null);
+		return (cloudControllerUrl != null) ? new ReactiveCloudFoundrySecurityService(
+				webClientBuilder, cloudControllerUrl, skipSslValidation) : null;
 	}
 
 	private CorsConfiguration getCorsConfiguration() {

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

@@ -130,8 +130,8 @@ private CloudFoundrySecurityService getCloudFoundrySecurityService(
 		String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
 		boolean skipSslValidation = environment.getProperty(
 				"management.cloudfoundry.skip-ssl-validation", Boolean.class, false);
-		return (cloudControllerUrl != null ? new CloudFoundrySecurityService(
-				restTemplateBuilder, cloudControllerUrl, skipSslValidation) : null);
+		return (cloudControllerUrl != null) ? new CloudFoundrySecurityService(
+				restTemplateBuilder, cloudControllerUrl, skipSslValidation) : null;
 	}
 
 	private CorsConfiguration getCorsConfiguration() {

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

@@ -125,8 +125,8 @@ public ContextConditionEvaluation(ConfigurableApplicationContext context) {
 			this.unconditionalClasses = report.getUnconditionalClasses();
 			report.getConditionAndOutcomesBySource().forEach(
 					(source, conditionAndOutcomes) -> add(source, conditionAndOutcomes));
-			this.parentId = (context.getParent() != null ? context.getParent().getId()
-					: null);
+			this.parentId = (context.getParent() != null) ? context.getParent().getId()
+					: null;
 		}
 
 		private void add(String source, ConditionAndOutcomes conditionAndOutcomes) {

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

@@ -82,7 +82,7 @@ public HealthIndicator elasticsearchHealthIndicator() {
 		protected ElasticsearchHealthIndicator createHealthIndicator(Client client) {
 			Duration responseTimeout = this.properties.getResponseTimeout();
 			return new ElasticsearchHealthIndicator(client,
-					responseTimeout != null ? responseTimeout.toMillis() : 100,
+					(responseTimeout != null) ? responseTimeout.toMillis() : 100,
 					this.properties.getIndices());
 		}
 

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

@@ -36,7 +36,7 @@
  * {@link EndpointFilter} that will filter endpoints based on {@code include} and
  * {@code exclude} properties.
  *
- * @param <E> The endpoint type
+ * @param <E> the endpoint type
  * @author Phillip Webb
  * @since 2.0.0
  */

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

@@ -112,7 +112,7 @@ protected DataSourceHealthIndicator createHealthIndicator(DataSource source) {
 	private String getValidationQuery(DataSource source) {
 		DataSourcePoolMetadata poolMetadata = this.poolMetadataProvider
 				.getDataSourcePoolMetadata(source);
-		return (poolMetadata != null ? poolMetadata.getValidationQuery() : null);
+		return (poolMetadata != null) ? poolMetadata.getValidationQuery() : null;
 	}
 
 }

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

@@ -51,9 +51,9 @@ class MeterRegistryConfigurer {
 			Collection<MeterFilter> filters,
 			Collection<MeterRegistryCustomizer<?>> customizers,
 			boolean addToGlobalRegistry) {
-		this.binders = (binders != null ? binders : Collections.emptyList());
-		this.filters = (filters != null ? filters : Collections.emptyList());
-		this.customizers = (customizers != null ? customizers : Collections.emptyList());
+		this.binders = (binders != null) ? binders : Collections.emptyList();
+		this.filters = (filters != null) ? filters : Collections.emptyList();
+		this.customizers = (customizers != null) ? customizers : Collections.emptyList();
 		this.addToGlobalRegistry = addToGlobalRegistry;
 	}
 

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

@@ -27,7 +27,7 @@
  * the registry.
  *
  * @author Jon Schneider
- * @param <T> The registry type to customize
+ * @param <T> the registry type to customize
  * @since 2.0.0
  */
 @FunctionalInterface