root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5843 from izeye/polish-20160503 

* pr/5843:
  Polish
This commit is contained in:
Stephane Nicoll 2016-05-03 09:33:47 +02:00
parent a75858ea01 7763c2ae4c
commit 502d14cfce
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java
View File

@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import;
* rules as {@code @EnableAutoConfiguration} but restricts the auto-configuration classes * rules as {@code @EnableAutoConfiguration} but restricts the auto-configuration classes
* to the specified set, rather than consulting {@code spring.factories}. * to the specified set, rather than consulting {@code spring.factories}.
* <p> * <p>
* 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 * annotation, however, {@code @ImportAutoConfiguration} can be useful in some situations
* and especially when writing tests. * and especially when writing tests.
* *

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java
View File

@ -40,7 +40,7 @@ import org.springframework.session.hazelcast.config.annotation.web.http.Hazelcas
class HazelcastSessionConfiguration { class HazelcastSessionConfiguration {
@Configuration @Configuration
public static class SprigBootHazelcastHttpSessionConfiguration public static class SpringBootHazelcastHttpSessionConfiguration
extends HazelcastHttpSessionConfiguration { extends HazelcastHttpSessionConfiguration {
@Autowired @Autowired

4
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/security/MockMvcSecurityAutoConfigurationIntegrationTests.java
View File

@ -20,7 +20,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; 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.MockMvcSecurityAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -46,9 +45,6 @@ public class MockMvcSecurityAutoConfigurationIntegrationTests {
@Autowired @Autowired
MockMvc mockMvc; MockMvc mockMvc;
@Autowired
ConditionEvaluationReport conditionEvaluationReport;
@Test @Test
@WithMockUser(username = "test", password = "test", roles = "USER") @WithMockUser(username = "test", password = "test", roles = "USER")
public void okResponseWithMockUser() throws Exception { public void okResponseWithMockUser() throws Exception {

2
spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedWebEnvironmentTests.java
View File

@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Base class for {@link SpringBootTest} tests configured to start an embedded servlet * Base class for {@link SpringBootTest} tests configured to start an embedded servlet
* container * container.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson

2
spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java
View File

@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; 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 Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson