From 690da89c8232a4a6a61206f34fb6cdfa73b626d7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 5 Sep 2015 00:21:09 -0700 Subject: [PATCH] Fix warnings --- .../actuate/hypermedia/HealthEndpointDocumentation.java | 9 --------- .../hypermedia/HypermediaEndpointDocumentation.java | 9 --------- .../EndpointWebMvcChildContextConfiguration.java | 3 --- ...ntWebMvcHypermediaManagementContextConfiguration.java | 7 ------- .../EndpointWebMvcManagementContextConfiguration.java | 4 ---- .../BrowserPathHypermediaIntegrationTests.java | 4 ---- ...ConfigurationPropertiesReportEndpointParentTests.java | 5 ----- .../endpoint/mvc/JolokiaMvcEndpointContextPathTests.java | 3 --- .../autoconfigure/jersey/JerseyAutoConfiguration.java | 4 ---- .../security/AuthenticationManagerConfiguration.java | 8 ++------ .../autoconfigure/cache/support/MockCachingProvider.java | 2 +- .../jdbc/DataSourceAutoConfigurationTests.java | 1 - .../jms/hornetq/HornetQAutoConfigurationTests.java | 4 ---- .../security/SecurityAutoConfigurationTests.java | 2 +- .../boot/autoconfigure/security/user/SecurityConfig.java | 2 +- .../web/MultipartAutoConfigurationTests.java | 4 ---- .../autoconfigure/web/WebMvcAutoConfigurationTests.java | 1 - .../boot/cli/compiler/grape/AetherGrapeEngineTests.java | 1 - .../boot/loader/data/RandomAccessDataFile.java | 1 - .../logging/logback/DefaultLogbackConfiguration.java | 1 - .../boot/logging/logback/LogbackConfigurator.java | 3 ++- .../springframework/boot/orm/jpa/EntityScanTests.java | 2 +- 22 files changed, 8 insertions(+), 72 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java index 6b2243c33a6..66b1c59cc2d 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java @@ -16,14 +16,11 @@ package org.springframework.boot.actuate.hypermedia; -import groovy.text.TemplateEngine; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; @@ -50,12 +47,6 @@ public class HealthEndpointDocumentation { @Autowired private WebApplicationContext context; - @Autowired - private MvcEndpoints mvcEndpoints; - - @Autowired - private TemplateEngine templates; - @Value("${org.springframework.restdocs.outputDir:target/generated-snippets}") private String restdocsOutputDir; diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java index 3742bfbf2e6..e6e6620f499 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java @@ -16,14 +16,11 @@ package org.springframework.boot.actuate.hypermedia; -import groovy.text.TemplateEngine; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; @@ -49,12 +46,6 @@ public class HypermediaEndpointDocumentation { @Autowired private WebApplicationContext context; - @Autowired - private MvcEndpoints mvcEndpoints; - - @Autowired - private TemplateEngine templates; - @Value("${org.springframework.restdocs.outputDir:target/generated-snippets}") private String restdocsOutputDir; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index eb0167be5e0..c2f9434781e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -82,9 +82,6 @@ public class EndpointWebMvcChildContextConfiguration { @Value("${error.path:/error}") private String errorPath = "/error"; - @Autowired - private ManagementServerProperties managementServerProperties; - @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME) public DispatcherServlet dispatcherServlet() { DispatcherServlet dispatcherServlet = new DispatcherServlet(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java index 2073c8701a8..3b1f73712f7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java @@ -67,7 +67,6 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; @@ -219,17 +218,11 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration { @ControllerAdvice(assignableTypes = MvcEndpoint.class) public static class MvcEndpointAdvice implements ResponseBodyAdvice { - @Autowired - private ManagementServerProperties management; - @Autowired private HttpMessageConverters converters; private Map> converterCache = new ConcurrentHashMap>(); - @Autowired - private ObjectMapper mapper; - @Override public boolean supports(MethodParameter returnType, Class> converterType) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java index 2b71dbb2369..bd667edbff5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java @@ -41,7 +41,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; @@ -62,9 +61,6 @@ import org.springframework.web.cors.CorsConfiguration; EndpointCorsProperties.class }) public class EndpointWebMvcManagementContextConfiguration { - @Autowired - private ApplicationContext applicationContext; - @Autowired private HealthMvcEndpointProperties healthMvcEndpointProperties; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java index bc6eddb7602..03409f3b834 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java @@ -22,7 +22,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.BrowserPathHypermediaIntegrationTests.SpringBootHypermediaApplication; import org.springframework.boot.actuate.endpoint.mvc.ActuatorHalBrowserEndpoint; -import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; @@ -57,9 +56,6 @@ public class BrowserPathHypermediaIntegrationTests { @Autowired private WebApplicationContext context; - @Autowired - private MvcEndpoints mvcEndpoints; - private MockMvc mockMvc; @Before diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java index 36c8ee7a755..7579fc8dd9d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java @@ -20,8 +20,6 @@ import java.util.Map; import org.junit.After; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; @@ -115,9 +113,6 @@ public class ConfigurationPropertiesReportEndpointParentTests { @EnableConfigurationProperties public static class Factory { - @Autowired - private ConfigurationBeanFactoryMetaData beanFactoryMetaData; - @Bean public ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java index b2e9b9dc214..26d89adc326 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java @@ -55,9 +55,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration public class JolokiaMvcEndpointContextPathTests { - @Autowired - private MvcEndpoints endpoints; - @Autowired private WebApplicationContext context; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index e106f14c8b0..8a3f5a7d396 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -29,7 +29,6 @@ import javax.ws.rs.ApplicationPath; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.servlet.ServletProperties; -import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureOrder; @@ -71,9 +70,6 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer { @Autowired private JerseyProperties jersey; - @Autowired - private ListableBeanFactory context; - @Autowired private ResourceConfig config; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java index ebaa9d55cf6..98844f7180e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java @@ -69,9 +69,6 @@ public class AuthenticationManagerConfiguration { private static Log logger = LogFactory .getLog(AuthenticationManagerConfiguration.class); - @Autowired - private List dependencies; - @Bean @Primary public AuthenticationManager authenticationManager( @@ -97,9 +94,8 @@ public class AuthenticationManagerConfiguration { * {@link GlobalAuthenticationConfigurerAdapter#init(AuthenticationManagerBuilder)} * exists that adds a {@link SecurityConfigurer} to the * {@link AuthenticationManagerBuilder}. - *
  • - * {@link AuthenticationManagerConfiguration#init(AuthenticationManagerBuilder)} adds - * {@link SpringBootAuthenticationConfigurerAdapter} so it is after the + *
  • {@link AuthenticationManagerConfiguration#init(AuthenticationManagerBuilder)} + * adds {@link SpringBootAuthenticationConfigurerAdapter} so it is after the * {@link SecurityConfigurer} in the first step.
    • *
  • We then can default an {@link AuthenticationProvider} if necessary. Note we can * only invoke the diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java index fc51d34f797..dfc8a5ae039 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock; public class MockCachingProvider implements CachingProvider { @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ "rawtypes", "unchecked" }) public CacheManager getCacheManager(URI uri, ClassLoader classLoader, Properties properties) { CacheManager cacheManager = mock(CacheManager.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index e89b12bdadc..6a9184f2b1b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -272,7 +272,6 @@ public class DataSourceAutoConfigurationTests { } - @SuppressWarnings("unused") // see testExplicitDriverClassClearsUserName public static class DatabaseDriver implements Driver { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java index d96d2a3cd6b..cb85bf2d7af 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java @@ -41,7 +41,6 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.EnvironmentTestUtils; @@ -402,9 +401,6 @@ public class HornetQAutoConfigurationTests { @Configuration protected static class CustomHornetQConfiguration { - @Autowired - private HornetQProperties properties; - @Bean public HornetQConfigurationCustomizer myHornetQCustomize() { return new HornetQConfigurationCustomizer() { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 3f0dcb96dcc..877cf8dc190 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -402,7 +402,7 @@ public class SecurityAutoConfigurationTests { protected static class SecurityCustomizer extends WebSecurityConfigurerAdapter { @Autowired - private AuthenticationManager authenticationManager; + AuthenticationManager authenticationManager; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/SecurityConfig.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/SecurityConfig.java index 5e4664d397a..1c5d9599b1d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/SecurityConfig.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/SecurityConfig.java @@ -31,7 +31,7 @@ import org.springframework.security.config.annotation.method.configuration.Enabl public class SecurityConfig extends GlobalAuthenticationConfigurerAdapter { @Autowired - private UserRepository userRepository; + protected UserRepository userRepository; @Override public void init(AuthenticationManagerBuilder auth) throws Exception { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java index 1b7deeaafb6..e4454c50411 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -26,7 +26,6 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; @@ -257,9 +256,6 @@ public class MultipartAutoConfigurationTests { @EnableConfigurationProperties(MultipartProperties.class) protected static class BaseConfiguration { - @Autowired - private MultipartProperties properties; - @Bean public ServerProperties serverProperties() { ServerProperties properties = new ServerProperties(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java index cb6d6578c71..0d02deb71e8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -468,7 +468,6 @@ public class WebMvcAutoConfigurationTests { is(instanceOf(CustomWebBindingInitializer.class))); } - @SuppressWarnings("unchecked") private void load(Class config, String... environment) { this.context = new AnnotationConfigEmbeddedWebApplicationContext(); EnvironmentTestUtils.addEnvironment(this.context, environment); diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index a1c63a5b4b7..d62d11eef3c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java @@ -121,7 +121,6 @@ public class AetherGrapeEngineTests { }); } - @SuppressWarnings("unchecked") @Test public void dependencyResolutionWithExclusions() { Map args = new HashMap(); diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java index 0fc16f83e08..adc36d48fb1 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java @@ -242,7 +242,6 @@ public class RandomAccessDataFile implements RandomAccessData { this.files = new ConcurrentLinkedQueue(); } - @SuppressWarnings("resource") public RandomAccessFile acquire() throws IOException { try { this.available.acquire(); diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java index 2786d31beff..e2b30482994 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java @@ -72,7 +72,6 @@ class DefaultLogbackConfiguration { return new RelaxedPropertyResolver(environment, "logging.pattern."); } - @SuppressWarnings("unchecked") public void apply(LogbackConfigurator config) { synchronized (config.getConfigurationLock()) { base(config); diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java index 52378fa450f..7f7b7a75e5b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java @@ -94,7 +94,8 @@ class LogbackConfigurator { } } - public void root(Level level, Appender... appenders) { + @SafeVarargs + public final void root(Level level, Appender... appenders) { Logger logger = this.context.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); if (level != null) { logger.setLevel(level); diff --git a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java index c2773c7dd8a..1d516b9eb63 100644 --- a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/EntityScanTests.java @@ -170,7 +170,7 @@ public class EntityScanTests { static class BeanPostProcessorConfiguration { @Autowired - private EntityManagerFactory entityManagerFactory; + protected EntityManagerFactory entityManagerFactory; @Bean public BeanPostProcessor beanPostProcessor() {