From ce9c053cbfc41f4753830bbb6c55ee7b2487856b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 27 Jul 2018 23:58:57 +0100 Subject: [PATCH] Fix checkstyle issues on master Fix checkstyle issues following 2.0.x merge and spring-javaformat upgrade. See gh-13932 --- .../springframework/boot/actuate/cache/CachesEndpoint.java | 2 +- .../boot/actuate/cache/CachesEndpointWebExtension.java | 4 ++-- .../springframework/boot/actuate/health/HealthEndpoint.java | 4 ++-- .../metrics/web/reactive/client/WebClientExchangeTags.java | 2 +- .../boot/autoconfigure/orm/jpa/HibernateProperties.java | 2 +- .../client/OAuth2ClientPropertiesRegistrationAdapter.java | 4 ++-- .../java/org/springframework/boot/maven/EnvVariables.java | 2 +- .../java/org/springframework/boot/maven/RepackageMojo.java | 6 +++--- .../boot/web/servlet/ServletContextInitializerBeans.java | 4 ++-- .../client/HttpWebServiceMessageSenderBuilder.java | 4 ++-- .../boot/webservices/client/WebServiceTemplateBuilder.java | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpoint.java index 26d73e0303e..291463dcf55 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpoint.java @@ -147,7 +147,7 @@ public class CachesEndpoint { } private Predicate isNameMatch(String name) { - return (name != null ? ((requested) -> requested.equals(name)) : matchAll()); + return (name != null) ? ((requested) -> requested.equals(name)) : matchAll(); } private Predicate matchAll() { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpointWebExtension.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpointWebExtension.java index 8258ead0bc9..8029e7ee5bb 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpointWebExtension.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/CachesEndpointWebExtension.java @@ -44,8 +44,8 @@ public class CachesEndpointWebExtension { @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) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java index 8004a552025..2692da77472 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpoint.java @@ -60,7 +60,7 @@ public class HealthEndpoint { 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 class HealthEndpoint { 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, diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java index 5ffc05009c2..c5577f4cb20 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java @@ -93,7 +93,7 @@ public final class WebClientExchangeTags { * @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; } /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java index 13e1112a97c..d4100bcc350 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java @@ -127,7 +127,7 @@ public class HibernateProperties { 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 { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index a12c7864bcd..f01e6539405 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java @@ -78,8 +78,8 @@ public final class OAuth2ClientPropertiesRegistrationAdapter { private static Builder getBuilderFromIssuerIfPossible(String registrationId, String configuredProviderId, Map 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(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java index a38d4876e1c..eae12a73104 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java @@ -49,7 +49,7 @@ class EnvVariables { } private static String getValue(String value) { - return (value != null ? value : ""); + return (value != null) ? value : ""; } public Map asMap() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 306d93ce8b0..8444b1a36f0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -236,7 +236,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { */ 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 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { 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); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java index a08fc0bac42..5c92ff5d450 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java +++ b/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... 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 sortedInitializers = this.initializers.values() diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java index 2c97d952ba3..530c3b11d55 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java @@ -77,9 +77,9 @@ public class HttpWebServiceMessageSenderBuilder { } 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); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java index a855d780cac..1baf8d7196c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java @@ -549,8 +549,8 @@ public class WebServiceTemplateBuilder { } private static Set append(Set set, Collection additions) { - Set result = new LinkedHashSet<>(set != null ? set : Collections.emptySet()); - result.addAll(additions != null ? additions : Collections.emptyList()); + Set result = new LinkedHashSet<>((set != null) ? set : Collections.emptySet()); + result.addAll((additions != null) ? additions : Collections.emptyList()); return Collections.unmodifiableSet(result); }