Fix checkstyle issues on master

Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932

Author: philwebb

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

@@ -147,7 +147,7 @@ private boolean clearCache(CacheEntry entry) {
 	}
 
 	private Predicate<String> isNameMatch(String name) {
-		return (name != null ? ((requested) -> requested.equals(name)) : matchAll());
+		return (name != null) ? ((requested) -> requested.equals(name)) : matchAll();
 	}
 
 	private Predicate<String> matchAll() {

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

@@ -44,8 +44,8 @@ public WebEndpointResponse<CacheEntry> cache(@Selector String cache,
 			@Nullable String cacheManager) {
 		try {
 			CacheEntry entry = this.delegate.cache(cache, cacheManager);
-			int status = (entry != null ? WebEndpointResponse.STATUS_OK
-					: WebEndpointResponse.STATUS_NOT_FOUND);
+			int status = (entry != null) ? WebEndpointResponse.STATUS_OK
+					: WebEndpointResponse.STATUS_NOT_FOUND;
 			return new WebEndpointResponse<>(entry, status);
 		}
 		catch (NonUniqueCacheException ex) {

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

@@ -60,7 +60,7 @@ public Health health() {
 	public Health healthForComponent(@Selector String component) {
 		HealthIndicator indicator = getNestedHealthIndicator(this.healthIndicator,
 				component);
-		return (indicator != null ? indicator.health() : null);
+		return (indicator != null) ? indicator.health() : null;
 	}
 
 	/**
@@ -77,7 +77,7 @@ public Health healthForComponentInstance(@Selector String component,
 		HealthIndicator indicator = getNestedHealthIndicator(this.healthIndicator,
 				component);
 		HealthIndicator nestedIndicator = getNestedHealthIndicator(indicator, instance);
-		return (nestedIndicator != null ? nestedIndicator.health() : null);
+		return (nestedIndicator != null) ? nestedIndicator.health() : null;
 	}
 
 	private HealthIndicator getNestedHealthIndicator(HealthIndicator healthIndicator,

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java

@@ -93,7 +93,7 @@ public static Tag status(ClientResponse response) {
 	 * @return the status tag
 	 */
 	public static Tag status(Throwable throwable) {
-		return (throwable instanceof IOException ? IO_ERROR : CLIENT_ERROR);
+		return (throwable instanceof IOException) ? IO_ERROR : CLIENT_ERROR;
 	}
 
 	/**

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java

@@ -127,7 +127,7 @@ private String determineDdlAuto(Map<String, String> existing,
 		if (ddlAuto != null) {
 			return ddlAuto;
 		}
-		return (this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get());
+		return (this.ddlAuto != null) ? this.ddlAuto : defaultDdlAuto.get();
 	}
 
 	public static class Naming {

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

@@ -78,8 +78,8 @@ private static ClientRegistration getClientRegistration(String registrationId,
 
 	private static Builder getBuilderFromIssuerIfPossible(String registrationId,
 			String configuredProviderId, Map<String, Provider> providers) {
-		String providerId = (configuredProviderId != null ? configuredProviderId
-				: registrationId);
+		String providerId = (configuredProviderId != null) ? configuredProviderId
+				: registrationId;
 		if (providers.containsKey(providerId)) {
 			Provider provider = providers.get(providerId);
 			String issuer = provider.getIssuerUri();

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java

@@ -49,7 +49,7 @@ private static Map<String, String> parseEnvVariables(Map<String, String> args) {
 	}
 
 	private static String getValue(String value) {
-		return (value != null ? value : "");
+		return (value != null) ? value : "";
 	}
 
 	public Map<String, String> asMap() {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -236,7 +236,7 @@ private void repackage() throws MojoExecutionException {
 	 */
 	private Artifact getSourceArtifact() {
 		Artifact sourceArtifact = getArtifact(this.classifier);
-		return (sourceArtifact != null ? sourceArtifact : this.project.getArtifact());
+		return (sourceArtifact != null) ? sourceArtifact : this.project.getArtifact();
 	}
 
 	private Artifact getArtifact(String classifier) {
@@ -345,8 +345,8 @@ private void attachArtifact(Artifact source, File target) {
 					this.classifier, target);
 		}
 		else {
-			String artifactId = (this.classifier != null
-					? "artifact with classifier " + this.classifier : "main artifact");
+			String artifactId = (this.classifier != null)
+					? "artifact with classifier " + this.classifier : "main artifact";
 			getLog().info(String.format("Replacing %s %s", artifactId, source.getFile()));
 			source.setFile(target);
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

@@ -81,9 +81,9 @@ public class ServletContextInitializerBeans
 	public ServletContextInitializerBeans(ListableBeanFactory beanFactory,
 			Class<? extends ServletContextInitializer>... initializerTypes) {
 		this.initializers = new LinkedMultiValueMap<>();
-		this.initializerTypes = (initializerTypes.length != 0
+		this.initializerTypes = (initializerTypes.length != 0)
 				? Arrays.asList(initializerTypes)
-				: Collections.singletonList(ServletContextInitializer.class));
+				: Collections.singletonList(ServletContextInitializer.class);
 		addServletContextInitializerBeans(beanFactory);
 		addAdaptableBeans(beanFactory);
 		List<ServletContextInitializer> sortedInitializers = this.initializers.values()

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java

@@ -77,9 +77,9 @@ public HttpWebServiceMessageSenderBuilder requestFactory(
 	}
 
 	public WebServiceMessageSender build() {
-		ClientHttpRequestFactory requestFactory = (this.requestFactorySupplier != null
+		ClientHttpRequestFactory requestFactory = (this.requestFactorySupplier != null)
 				? this.requestFactorySupplier.get()
-				: new ClientHttpRequestFactorySupplier().get());
+				: new ClientHttpRequestFactorySupplier().get();
 		if (this.connectTimeout != null) {
 			new TimeoutRequestFactoryCustomizer(this.connectTimeout, "setConnectTimeout")
 					.customize(requestFactory);