Temporarily remove security matchers

Temporarily back out `SpringBootSecurity` to enable easier package refactoring. See spring-projectsgh-10261
emilva · Sep 12, 2017 · 0f99b29 · 0f99b29
1 parent ecb8461
commit 0f99b29
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 390 deletions.
diff --git a/.../main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java b/.../main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
@@ -16,14 +16,10 @@
 
 package org.springframework.boot.autoconfigure.security;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.web.servlet.error.ErrorController;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.endpoint.DefaultEndpointPathResolver;
-import org.springframework.boot.endpoint.EndpointPathResolver;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,20 +52,6 @@
 		AuthenticationManagerConfiguration.class, SecurityDataConfiguration.class })
 public class SecurityAutoConfiguration {
 
-	@Bean
-	@ConditionalOnMissingBean
-	public EndpointPathResolver endpointPathResolver() {
-		return new DefaultEndpointPathResolver();
-	}
-
-	@Bean
-	public SpringBootSecurity springBootSecurity(
-			EndpointPathResolver endpointPathResolver,
-			ObjectProvider<ErrorController> errorController) {
-		return new SpringBootSecurity(endpointPathResolver,
-				errorController.getIfAvailable());
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(AuthenticationEventPublisher.class)
 	public DefaultAuthenticationEventPublisher authenticationEventPublisher(

diff --git a/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootSecurity.java b/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootSecurity.java
diff --git a/...rc/test/java/org/springframework/boot/autoconfigure/security/SpringBootSecurityTests.java b/...rc/test/java/org/springframework/boot/autoconfigure/security/SpringBootSecurityTests.java