From 7763c2ae4cfb903c9d684bddf90ece2133c06acc Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 May 2016 14:01:42 +0900 Subject: [PATCH] Polish Closes gh-5843 --- .../boot/autoconfigure/ImportAutoConfiguration.java | 2 +- .../autoconfigure/session/HazelcastSessionConfiguration.java | 2 +- .../MockMvcSecurityAutoConfigurationIntegrationTests.java | 4 ---- .../AbstractSpringBootTestEmbeddedWebEnvironmentTests.java | 2 +- .../context/SpringBootTestWebEnvironmentRandomPortTests.java | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java index 463d234bca2..ef108387021 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import; * rules as {@code @EnableAutoConfiguration} but restricts the auto-configuration classes * to the specified set, rather than consulting {@code spring.factories}. *

- * Generally, {@code @EnableAutoConfiguration} should used in preference to this + * Generally, {@code @EnableAutoConfiguration} should be used in preference to this * annotation, however, {@code @ImportAutoConfiguration} can be useful in some situations * and especially when writing tests. * diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java index d157a7f1c38..09331e224a0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.session.hazelcast.config.annotation.web.http.Hazelcas class HazelcastSessionConfiguration { @Configuration - public static class SprigBootHazelcastHttpSessionConfiguration + public static class SpringBootHazelcastHttpSessionConfiguration extends HazelcastHttpSessionConfiguration { @Autowired diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/security/MockMvcSecurityAutoConfigurationIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/security/MockMvcSecurityAutoConfigurationIntegrationTests.java index e955a49140d..29901612b64 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/security/MockMvcSecurityAutoConfigurationIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/security/MockMvcSecurityAutoConfigurationIntegrationTests.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; import org.springframework.boot.test.autoconfigure.web.servlet.MockMvcSecurityAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.HttpHeaders; @@ -46,9 +45,6 @@ public class MockMvcSecurityAutoConfigurationIntegrationTests { @Autowired MockMvc mockMvc; - @Autowired - ConditionEvaluationReport conditionEvaluationReport; - @Test @WithMockUser(username = "test", password = "test", roles = "USER") public void okResponseWithMockUser() throws Exception { diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java index 630d8deaa7f..cb02aae86b5 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Base class for {@link SpringBootTest} tests configured to start an embedded servlet - * container + * container. * * @author Phillip Webb * @author Andy Wilkinson diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java index 01e13028c61..f2efd286d43 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.config.annotation.EnableWebMvc; /** - * Tests for {@link SpringBootTest} configured with {@link WebEnvironment#DEFINED_PORT}. + * Tests for {@link SpringBootTest} configured with {@link WebEnvironment#RANDOM_PORT}. * * @author Phillip Webb * @author Andy Wilkinson