diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java index 60a3cb2b21a..83648a9f594 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java @@ -66,7 +66,7 @@ public class RedisHealthIndicator extends AbstractHealthIndicator { } } finally { - RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory); + RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory, false); } } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java index 22dd017cedc..36efed2f756 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java @@ -25,7 +25,6 @@ import org.junit.runner.RunWith; 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 @@ import org.springframework.util.FileCopyUtils; @RunWith(WebEndpointRunners.class) public class LogFileWebEndpointWebIntegrationTests { - private static ConfigurableApplicationContext context; - private static WebTestClient client; @ClassRule diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index c68302c443d..7ffa376f661 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -100,6 +100,7 @@ public class BatchAutoConfiguration { return factory; } + @Configuration @ConditionalOnBean(DataSource.class) @ConditionalOnClass(DatabasePopulator.class) static class DataSourceInitializerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index d518b4b54d3..8c364a8984c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -42,7 +42,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder; 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 class LiquibaseAutoConfiguration { 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, + ObjectProvider dataSource, @LiquibaseDataSource ObjectProvider liquibaseDataSource) { this.properties = properties; this.dataSourceProperties = dataSourceProperties; - this.resourceLoader = resourceLoader; this.dataSource = dataSource.getIfUnique(); this.liquibaseDataSource = liquibaseDataSource.getIfAvailable(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 670fe0eb3c7..183b8850bd0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -126,6 +126,7 @@ public class RabbitAutoConfigurationTests { } @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 class RabbitAutoConfigurationTests { } @Test + @SuppressWarnings("unchecked") public void testConnectionFactoryWithCustomConnectionNameStrategy() { this.contextRunner.withUserConfiguration(ConnectionNameStrategyConfiguration.class).run((context) -> { CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class); diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java index d455c980bdf..e698051f30d 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Component; * @author Madhura Bhave */ @Component +@SuppressWarnings("rawtypes") public class SimpleFactoryBean implements FactoryBean { private static boolean isInitializedEarly = false; @@ -40,10 +41,12 @@ public class SimpleFactoryBean implements FactoryBean { } } + @Override public Object getObject() { return new Object(); } + @Override public Class getObjectType() { return Object.class; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java index da903d38d62..dcad7a790cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java @@ -22,6 +22,7 @@ import java.util.Map; /** * A pojo with a complex generic signature. * + * @param the generic type * @author Stephane Nicoll */ public class UpperBoundGenericPojo> { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java index af33acc8411..b457972555a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java @@ -58,13 +58,13 @@ public class CompressionConnectorCustomizerTests { 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());