Polish

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java

@@ -66,7 +66,7 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {
 			}
 		}
 		finally {
-			RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory);
+			RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory, false);
 		}
 	}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java

@@ -25,7 +25,6 @@
 
 import org.springframework.boot.actuate.endpoint.web.test.WebEndpointRunners;
 import org.springframework.boot.logging.LogFile;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -42,8 +41,6 @@
 @RunWith(WebEndpointRunners.class)
 public class LogFileWebEndpointWebIntegrationTests {
 
-	private static ConfigurableApplicationContext context;
-
 	private static WebTestClient client;
 
 	@ClassRule

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

@@ -100,6 +100,7 @@ public SimpleJobOperator jobOperator(JobExplorer jobExplorer, JobLauncher jobLau
 		return factory;
 	}
 
+	@Configuration
 	@ConditionalOnBean(DataSource.class)
 	@ConditionalOnClass(DatabasePopulator.class)
 	static class DataSourceInitializerConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -42,7 +42,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
@@ -84,18 +83,15 @@ public static class LiquibaseConfiguration {
 
 		private final DataSourceProperties dataSourceProperties;
 
-		private final ResourceLoader resourceLoader;
-
 		private final DataSource dataSource;
 
 		private final DataSource liquibaseDataSource;
 
 		public LiquibaseConfiguration(LiquibaseProperties properties, DataSourceProperties dataSourceProperties,
-				ResourceLoader resourceLoader, ObjectProvider<DataSource> dataSource,
+				ObjectProvider<DataSource> dataSource,
 				@LiquibaseDataSource ObjectProvider<DataSource> liquibaseDataSource) {
 			this.properties = properties;
 			this.dataSourceProperties = dataSourceProperties;
-			this.resourceLoader = resourceLoader;
 			this.dataSource = dataSource.getIfUnique();
 			this.liquibaseDataSource = liquibaseDataSource.getIfAvailable();
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

@@ -126,6 +126,7 @@ public void testDefaultConnectionFactoryConfiguration() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testConnectionFactoryWithOverrides() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 				.withPropertyValues("spring.rabbitmq.host:remote-server", "spring.rabbitmq.port:9000",
@@ -143,6 +144,7 @@ public void testConnectionFactoryWithOverrides() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testConnectionFactoryWithCustomConnectionNameStrategy() {
 		this.contextRunner.withUserConfiguration(ConnectionNameStrategyConfiguration.class).run((context) -> {
 			CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java

@@ -24,6 +24,7 @@
  * @author Madhura Bhave
  */
 @Component
+@SuppressWarnings("rawtypes")
 public class SimpleFactoryBean implements FactoryBean {
 
 	private static boolean isInitializedEarly = false;
@@ -40,10 +41,12 @@ public SimpleFactoryBean(ApplicationContext context) {
 		}
 	}
 
+	@Override
 	public Object getObject() {
 		return new Object();
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return Object.class;
 	}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java

@@ -22,6 +22,7 @@
 /**
  * A pojo with a complex generic signature.
  *
+ * @param <T> the generic type
  * @author Stephane Nicoll
  */
 public class UpperBoundGenericPojo<T extends Enum<T>> {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java

@@ -58,13 +58,13 @@ public void shouldCustomizeCompressionForHttp1AndHttp2Protocol() {
 		Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
 		connector.addUpgradeProtocol(new Http2Protocol());
 		compressionConnectorCustomizer.customize(connector);
-		AbstractHttp11Protocol abstractHttp11Protocol = (AbstractHttp11Protocol) connector.getProtocolHandler();
+		AbstractHttp11Protocol<?> abstractHttp11Protocol = (AbstractHttp11Protocol<?>) connector.getProtocolHandler();
 		verifyHttp1(abstractHttp11Protocol);
 		Http2Protocol http2Protocol = (Http2Protocol) connector.findUpgradeProtocols()[0];
 		verifyHttp2Upgrade(http2Protocol);
 	}
 
-	private void verifyHttp1(AbstractHttp11Protocol protocol) {
+	private void verifyHttp1(AbstractHttp11Protocol<?> protocol) {
 		compressionOn(protocol.getCompression());
 		minSize(protocol.getCompressionMinSize());
 		mimeType(protocol.getCompressibleMimeTypes());