Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Spring to catch SPR-11069

Browse Source
This commit is contained in:
Dave Syer
2013-11-17 07:59:03 +00:00
parent 0f85f31960
commit 2f7214002d
6 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
View File

@@ -96,9 +96,7 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
*/
@Configuration
@ConditionalOnClass({ EnableWebSecurity.class })
// TODO: re-enable this when SPR-11069 is fixed
// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
@ConditionalOnMissingBean(SecurityAutoConfiguration.class)
@ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
@EnableConfigurationProperties
public class SecurityAutoConfiguration {

13
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java
View File

@@ -21,7 +21,6 @@ import org.springframework.boot.TestUtils;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.mock.web.MockServletContext;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -46,7 +45,7 @@ public class SecurityAutoConfigurationTests {
public void testWebConfiguration() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext());
this.context.register(SecurityConfiguration.class,
this.context.register(SecurityAutoConfiguration.class,
EndpointAutoConfiguration.class,
ManagementServerPropertiesAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
@@ -61,7 +60,7 @@ public class SecurityAutoConfigurationTests {
public void testDisableIgnoredStaticApplicationPaths() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext());
this.context.register(SecurityConfiguration.class,
this.context.register(SecurityAutoConfiguration.class,
EndpointAutoConfiguration.class,
ManagementServerPropertiesAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
@@ -76,7 +75,7 @@ public class SecurityAutoConfigurationTests {
public void testDisableBasicAuthOnApplicationPaths() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext());
this.context.register(SecurityConfiguration.class,
this.context.register(SecurityAutoConfiguration.class,
EndpointAutoConfiguration.class,
ManagementServerPropertiesAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
@@ -100,12 +99,6 @@ public class SecurityAutoConfigurationTests {
this.context.getBean(AuthenticationManager.class));
}
// Use this while SPR-11069 prevents us from checking OnMissingBean by annotation
@Configuration
@Import(SecurityAutoConfiguration.class)
protected static class SecurityConfiguration {
}
@Configuration
protected static class TestConfiguration {