Browse Source

Fix warnings

pull/5661/head
Phillip Webb 10 years ago
parent
commit
7956e68224
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
  2. 5
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
  3. 1
      spring-boot-starters/pom.xml
  4. 2
      spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@ -108,8 +108,6 @@ public class EndpointWebMvcAutoConfiguration @@ -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;

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@ -26,9 +26,6 @@ import java.util.LinkedHashSet; @@ -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; @@ -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 = {};
/**

1
spring-boot-starters/pom.xml

@ -100,7 +100,6 @@ @@ -100,7 +100,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<inherited>false</inherited>
<executions>
<execution>

2
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@ -161,6 +161,7 @@ public class SpringApplicationTests { @@ -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 { @@ -170,6 +171,7 @@ public class SpringApplicationTests {
}
@Test
@Deprecated
public void disableBannerViaBannerModeProperty() throws Exception {
SpringApplication application = spy(new SpringApplication(ExampleConfig.class));
application.setWebEnvironment(false);

Loading…
Cancel
Save