Polish

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());

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<AssertableReactiveWebApplicationContext> withWebTestClient(
 			Consumer<WebTestClient> clientConsumer) {
 		return (context) -> {

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 extends AbstractApplicationContextRunner<?, ?, ?>> T apply(
 			T contextRunner, Class<?>[] exportAutoConfigurations) {
 		for (Class<?> configuration : exportAutoConfigurations) {

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,
+@ConditionalOnClass(SecurityEvaluationContextExtension.class)
-		EvaluationContextExtensionSupport.class })
 public class SecurityDataConfiguration {
 
 	@Bean

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<String, OAuth2ClientProperties.BaseClientRegistration> getRegistrations(
 			Environment environment) {
-		Map<String, OAuth2ClientProperties.BaseClientRegistration> registrations = new HashMap();
+		Map<String, OAuth2ClientProperties.BaseClientRegistration> registrations = new HashMap<>();
 		Map<String, OAuth2ClientProperties.LoginClientRegistration> loginClientRegistrations = Binder
 				.get(environment).bind("spring.security.oauth2.client.registration.login",
 						STRING_LOGIN_REGISTRATION_MAP)

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)
+					GenericObjectPoolConfig<?> poolConfig = getPoolingClientConfiguration(
-							.getPoolConfig();
+							cf).getPoolConfig();
 					assertThat(poolConfig.getMinIdle()).isEqualTo(1);
 					assertThat(poolConfig.getMaxIdle()).isEqualTo(4);
 					assertThat(poolConfig.getMaxTotal()).isEqualTo(16);

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");

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<Integer, String> kStream(StreamsBuilder streamsBuilder) {
 			KStream<Integer, String> 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;
 		}

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<Class<?>> getDefaultIncludes() {
 		if (this.annotation.secure()) {
 			if (ObjectUtils.isEmpty(this.annotation.controllers())) {

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();

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)

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