From 9fdb563d5acea57b892655b5928dfe54f5928f9d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 28 Nov 2016 15:27:01 -0800 Subject: [PATCH] Polish --- .../validation/ValidationAutoConfiguration.java | 4 ++-- .../cassandra/CassandraAutoConfigurationTests.java | 4 ++-- .../session/SessionAutoConfigurationHazelcastTests.java | 5 +++-- .../session/SessionAutoConfigurationTests.java | 2 -- .../validation/ValidationAutoConfigurationTests.java | 4 +++- ...nfigurationWithHibernateValidatorMissingElImplTests.java | 4 ++-- .../boot/autoconfigure/web/ServerPropertiesTests.java | 6 ------ 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index 0b075ce08cb..8655122da1c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -58,8 +58,8 @@ public class ValidationAutoConfiguration { @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - ConditionMessage.Builder message = ConditionMessage.forCondition( - getClass().getName()); + ConditionMessage.Builder message = ConditionMessage + .forCondition(getClass().getName()); try { Validation.buildDefaultValidatorFactory().getValidator(); return ConditionOutcome.match(message.available("JSR-303 provider")); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java index b94312b3a13..64d09cac7d9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java @@ -66,7 +66,8 @@ public class CassandraAutoConfigurationTests { public void createCustomizeCluster() { load(ClusterConfig.class); assertThat(this.context.getBeanNamesForType(Cluster.class).length).isEqualTo(1); - assertThat(this.context.getBeanNamesForType(ClusterCustomizer.class).length).isEqualTo(1); + assertThat(this.context.getBeanNamesForType(ClusterCustomizer.class).length) + .isEqualTo(1); } private void load(String... environment) { @@ -85,7 +86,6 @@ public class CassandraAutoConfigurationTests { this.context = ctx; } - @Configuration static class ClusterConfig { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java index 8c2674f855a..dd866436d34 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java @@ -70,8 +70,9 @@ public class SessionAutoConfigurationHazelcastTests "spring.session.hazelcast.flush-mode=immediate"); HazelcastSessionRepository repository = validateSessionRepository( HazelcastSessionRepository.class); - assertThat(new DirectFieldAccessor(repository).getPropertyValue( - "hazelcastFlushMode")).isEqualTo(HazelcastFlushMode.IMMEDIATE); + assertThat(new DirectFieldAccessor(repository) + .getPropertyValue("hazelcastFlushMode")) + .isEqualTo(HazelcastFlushMode.IMMEDIATE); } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java index 788ce036400..dc2bd1a9758 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java @@ -97,7 +97,6 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } @Test - @SuppressWarnings("unchecked") public void mongoSessionStore() { load(Arrays.asList(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class), @@ -106,7 +105,6 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } @Test - @SuppressWarnings("unchecked") public void mongoSessionStoreWithCustomizations() { load(Arrays.asList(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class), diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index f03f2db8c49..3d8c8038002 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -65,7 +65,8 @@ public class ValidationAutoConfigurationTests { load(SampleConfiguration.class); assertThat(this.context.getBean(MethodValidationPostProcessor.class)) .isSameAs(this.context.getBean("testMethodValidationPostProcessor")); - assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)).hasSize(1); + assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) + .hasSize(1); } public void load(Class config) { @@ -84,6 +85,7 @@ public class ValidationAutoConfigurationTests { public void doSomething(@Size(min = 3, max = 10) String name) { } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java index ad2973b6c0c..1ecf5854008 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java @@ -28,8 +28,8 @@ import org.springframework.validation.beanvalidation.MethodValidationPostProcess import static org.assertj.core.api.Assertions.assertThat; /** - * Test for {{@link ValidationAutoConfiguration} when Hibernate validator is present - * but no EL implementation is available. + * Test for {@link ValidationAutoConfiguration} when Hibernate validator is present but no + * EL implementation is available. * * @author Stephane Nicoll */ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java index 0753f83632a..13a4f4f17b7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java @@ -435,10 +435,8 @@ public class ServerPropertiesTests { map.put("server.tomcat.port-header", "x-my-forward-port"); map.put("server.tomcat.protocol-header-https-value", "On"); bindProperties(map); - TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); this.properties.customize(container); - assertThat(container.getEngineValves()).hasSize(1); Valve valve = container.getEngineValves().iterator().next(); assertThat(valve).isInstanceOf(RemoteIpValve.class); @@ -455,7 +453,6 @@ public class ServerPropertiesTests { Map map = new HashMap(); map.put("server.tomcat.accept-count", "10"); bindProperties(map); - TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); this.properties.customize(container); TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container @@ -469,7 +466,6 @@ public class ServerPropertiesTests { Map map = new HashMap(); map.put("server.tomcat.max-connections", "5"); bindProperties(map); - TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); this.properties.customize(container); TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container @@ -483,7 +479,6 @@ public class ServerPropertiesTests { Map map = new HashMap(); map.put("server.tomcat.max-http-post-size", "10000"); bindProperties(map); - TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); this.properties.customize(container); TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container @@ -498,7 +493,6 @@ public class ServerPropertiesTests { Map map = new HashMap(); map.put("server.max-http-post-size", "2000"); bindProperties(map); - TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(); this.properties.customize(container); TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container