From 8ee4775820726d8f73f248761ceb390d72dbc9c6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 4 Sep 2018 20:46:35 +0100 Subject: [PATCH] Polish --- .../metrics/OnlyOnceLoggingDenyMeterFilter.java | 6 ++++-- .../CloudFoundryWebFluxEndpointIntegrationTests.java | 7 ------- .../actuate/autoconfigure/metrics/test/MetricsRun.java | 1 + .../autoconfigure/security/SecurityDataConfiguration.java | 4 +--- .../security/oauth2/client/ClientsConfiguredCondition.java | 2 +- .../data/redis/RedisAutoConfigurationTests.java | 4 ++-- .../embedded/TomcatWebServerFactoryCustomizerTests.java | 1 + .../boot/docs/kafka/KafkaStreamsBeanExample.java | 2 +- .../autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java | 1 + .../servlet/SpringBootMockMvcBuilderCustomizerTests.java | 2 +- .../LombokAccessLevelOverwriteDefaultProperties.java | 1 + .../env/SpringApplicationJsonEnvironmentPostProcessor.java | 6 ------ 12 files changed, 14 insertions(+), 23 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java index 3538a6f2a5e..cad3250c8f4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java @@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.Meter.Id; import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.config.MeterFilterReply; import org.slf4j.Logger; @@ -28,7 +29,8 @@ import org.slf4j.LoggerFactory; import org.springframework.util.Assert; /** - * {@link MeterFilter} to log only once a warning message and deny {@link Meter.Id}. + * {@link MeterFilter} to log only once a warning message and deny a {@link Meter} + * {@link Id}. * * @author Jon Schneider * @author Dmytro Nosan @@ -49,7 +51,7 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter { } @Override - public MeterFilterReply accept(Meter.Id id) { + public MeterFilterReply accept(Id id) { if (this.logger.isWarnEnabled() && this.alreadyWarned.compareAndSet(false, true)) { this.logger.warn(this.message.get()); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java index 9e6ae48cfc2..f868ccecdfc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java @@ -167,13 +167,6 @@ public class CloudFoundryWebFluxEndpointIntegrationTests { .jsonPath("_links.test-part").doesNotExist())); } - private AnnotationConfigReactiveWebServerApplicationContext createApplicationContext( - Class... config) { - AnnotationConfigReactiveWebServerApplicationContext context = new AnnotationConfigReactiveWebServerApplicationContext(); - context.register(config); - return context; - } - private ContextConsumer withWebTestClient( Consumer clientConsumer) { return (context) -> { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java index 34b3c0ef41b..21c92c888dc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java @@ -93,6 +93,7 @@ public final class MetricsRun { return (contextRunner) -> apply(contextRunner, exportAutoConfigurations); } + @SuppressWarnings("unchecked") private static > T apply( T contextRunner, Class[] exportAutoConfigurations) { for (Class configuration : exportAutoConfigurations) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java index dee1f62aa35..969f0b35771 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java @@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport; import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension; /** @@ -30,8 +29,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont * @since 1.3 */ @Configuration -@ConditionalOnClass({ SecurityEvaluationContextExtension.class, - EvaluationContextExtensionSupport.class }) +@ConditionalOnClass(SecurityEvaluationContextExtension.class) public class SecurityDataConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java index 1d9cdd80b60..63ca5eb9a03 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java @@ -63,7 +63,7 @@ public class ClientsConfiguredCondition extends SpringBootCondition { private Map getRegistrations( Environment environment) { - Map registrations = new HashMap(); + Map registrations = new HashMap<>(); Map loginClientRegistrations = Binder .get(environment).bind("spring.security.oauth2.client.registration.login", STRING_LOGIN_REGISTRATION_MAP) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java index 658d2f31eb7..c48bd3f2f7c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java @@ -159,8 +159,8 @@ public class RedisAutoConfigurationTests { LettuceConnectionFactory cf = context .getBean(LettuceConnectionFactory.class); assertThat(cf.getHostName()).isEqualTo("foo"); - GenericObjectPoolConfig poolConfig = getPoolingClientConfiguration(cf) - .getPoolConfig(); + GenericObjectPoolConfig poolConfig = getPoolingClientConfiguration( + cf).getPoolConfig(); assertThat(poolConfig.getMinIdle()).isEqualTo(1); assertThat(poolConfig.getMaxIdle()).isEqualTo(4); assertThat(poolConfig.getMaxTotal()).isEqualTo(16); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java index 4460a789a03..30cfca3e0d2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java @@ -166,6 +166,7 @@ public class TomcatWebServerFactoryCustomizerTests { assertThat(remoteIpValve.getInternalProxies()).isEqualTo("192.168.0.1"); } + @SuppressWarnings("unchecked") @Test public void customStaticResourceAllowCaching() { bind("server.tomcat.resource.allow-caching=false"); diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java index d9ddf5f1954..886b6865673 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java @@ -42,7 +42,7 @@ public class KafkaStreamsBeanExample { @Bean public KStream kStream(StreamsBuilder streamsBuilder) { KStream stream = streamsBuilder.stream("ks1In"); - stream.map((k, v) -> new KeyValue(k, v.toUpperCase())).to("ks1Out", + stream.map((k, v) -> new KeyValue<>(k, v.toUpperCase())).to("ks1Out", Produced.with(Serdes.Integer(), new JsonSerde<>())); return stream; } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java index a74ef88efea..cb59cdf061f 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java @@ -126,6 +126,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { } @Override + @SuppressWarnings("deprecation") protected Set> getDefaultIncludes() { if (this.annotation.secure()) { if (ObjectUtils.isEmpty(this.annotation.controllers())) { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java index e281e3f02ce..2946d513d52 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java @@ -56,7 +56,7 @@ public class SpringBootMockMvcBuilderCustomizerTests { DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(context); this.customizer = new SpringBootMockMvcBuilderCustomizer(context); this.customizer.customize(builder); - FilterRegistrationBean registrationBean = (FilterRegistrationBean) context + FilterRegistrationBean registrationBean = (FilterRegistrationBean) context .getBean("filterRegistrationBean"); Filter testFilter = (Filter) context.getBean("testFilter"); Filter otherTestFilter = registrationBean.getFilter(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java index cd67459cf53..115fcb028a0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java @@ -33,6 +33,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; @ConfigurationProperties(prefix = "accesslevel.overwrite.default") public class LombokAccessLevelOverwriteDefaultProperties { + @SuppressWarnings("unused") private String name0; @Getter(AccessLevel.PUBLIC) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java index 6508b9cafa3..c7c0f153d50 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java @@ -21,9 +21,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.boot.SpringApplication; import org.springframework.boot.json.JsonParser; import org.springframework.boot.json.JsonParserFactory; @@ -74,9 +71,6 @@ public class SpringApplicationJsonEnvironmentPostProcessor */ public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 5; - private static final Log logger = LogFactory - .getLog(SpringApplicationJsonEnvironmentPostProcessor.class); - private int order = DEFAULT_ORDER; @Override