From 7956e682240c07564d754094a295f81a94fe16cd Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 11 Apr 2016 11:41:38 -0700 Subject: [PATCH] Fix warnings --- .../autoconfigure/EndpointWebMvcAutoConfiguration.java | 2 -- .../boot/autoconfigure/condition/OnBeanCondition.java | 5 ----- spring-boot-starters/pom.xml | 1 - .../org/springframework/boot/SpringApplicationTests.java | 2 ++ 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 66b72769f7..951d8d1989 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -108,8 +108,6 @@ public class EndpointWebMvcAutoConfiguration private static final Log logger = LogFactory .getLog(EndpointWebMvcAutoConfiguration.class); - private static final ConfigurableListableBeanFactory BeanDefinitionRegistry = null; - private ApplicationContext applicationContext; private BeanFactory beanFactory; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 2db03cb863..a650353609 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -26,9 +26,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.ListableBeanFactory; @@ -61,8 +58,6 @@ import org.springframework.util.StringUtils; @Order(Ordered.LOWEST_PRECEDENCE) class OnBeanCondition extends SpringBootCondition implements ConfigurationCondition { - private static final Log logger = LogFactory.getLog(OnBeanCondition.class); - private static final String[] NO_BEANS = {}; /** diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 40aa71d0b6..2f3a6671f7 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -100,7 +100,6 @@ maven-assembly-plugin - 2.6 false diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 5777d98fd8..c0b7fd3a46 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -161,6 +161,7 @@ public class SpringApplicationTests { } @Test + @Deprecated public void disableBannerWithMode() throws Exception { SpringApplication application = spy(new SpringApplication(ExampleConfig.class)); application.setWebEnvironment(false); @@ -170,6 +171,7 @@ public class SpringApplicationTests { } @Test + @Deprecated public void disableBannerViaBannerModeProperty() throws Exception { SpringApplication application = spy(new SpringApplication(ExampleConfig.class)); application.setWebEnvironment(false);