Shis simplifies the class hieararchy significantly.EC-2366: Extract AbstractRequestMatcherRegistry from AbstractRequestMatcherConfigurer

This simplifies the class hierarchy significantly.

config/src/test/groovy/org/springframework/security/config/annotation/web/RequestMatchersTests.groovy

@@ -15,7 +15,7 @@
  */
 package org.springframework.security.config.annotation.web;
 
-import static org.springframework.security.config.annotation.web.AbstractRequestMatcherConfigurer.RequestMatchers.*
+import static org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry.RequestMatchers.*
 
 import org.springframework.http.HttpMethod;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;

config/src/test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy

@@ -507,7 +507,7 @@ public class NamespaceHttpTests extends BaseSpringSpec {
     static class DisableUseExpressionsConfig extends BaseWebConfig {
         protected void configure(HttpSecurity http) throws Exception {
             http
-                .apply(new UrlAuthorizationConfigurer())
+                .apply(new UrlAuthorizationConfigurer()).getRegistry()
                     .antMatchers("/users**","/sessions/**").hasRole("USER")
                     .antMatchers("/signup").hasRole("ANONYMOUS")
                     .anyRequest().hasRole("USER")

config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistryTests.groovy

@@ -15,25 +15,20 @@
  */
 package org.springframework.security.config.annotation.web.configurers;
 
-import java.util.List;
+import org.springframework.http.HttpMethod
+import org.springframework.security.access.AccessDecisionVoter
+import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher
+import org.springframework.security.web.util.matcher.RegexRequestMatcher
+import org.springframework.security.web.util.matcher.RequestMatcher
 
-import org.springframework.http.HttpMethod;
-import org.springframework.security.access.AccessDecisionVoter;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractRequestMatcherMappingConfigurer;
-import org.springframework.security.web.DefaultSecurityFilterChain;
-import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.security.web.util.matcher.RegexRequestMatcher;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-
-import spock.lang.Specification;
+import spock.lang.Specification
 
 /**
  * @author Rob Winch
  *
  */
-class AbstractRequestMatcherMappingConfigurerTests extends Specification {
+class AbstractConfigAttributeRequestMatcherRegistryTests extends Specification {
     ConcreteAbstractRequestMatcherMappingConfigurer registry = new ConcreteAbstractRequestMatcherMappingConfigurer()
 
     def "regexMatchers(GET,'/a.*') uses RegexRequestMatcher"() {
@@ -64,7 +59,7 @@ class AbstractRequestMatcherMappingConfigurerTests extends Specification {
         matchers.collect {it.class } == [AntPathRequestMatcher]
     }
 
-    static class ConcreteAbstractRequestMatcherMappingConfigurer extends AbstractRequestMatcherMappingConfigurer<HttpSecurity,List<RequestMatcher>,DefaultSecurityFilterChain> {
+    static class ConcreteAbstractRequestMatcherMappingConfigurer extends AbstractConfigAttributeRequestMatcherRegistry<List<RequestMatcher>> {
         List<AccessDecisionVoter> decisionVoters() {
             return null;
         }

config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerConfigs.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.config.annotation.web.configurers;
+
+
+import java.util.Arrays;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.expression.SecurityExpressionHandler;
+import org.springframework.security.access.vote.AffirmativeBased;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
+import org.springframework.security.web.access.expression.WebExpressionVoter;
+
+/**
+ *
+ * @author Rob Winch
+ *
+ */
+public class ExpressionUrlAuthorizationConfigurerConfigs {
+
+    /**
+     * Ensure that All additional properties properly compile and chain properly
+     */
+    @EnableWebSecurity
+    @Configuration
+    static class AllPropertiesWorkConfig extends WebSecurityConfigurerAdapter {
+
+        @SuppressWarnings("rawtypes")
+        @Override
+        protected void configure(HttpSecurity http) throws Exception {
+            SecurityExpressionHandler<FilterInvocation> handler = new DefaultWebSecurityExpressionHandler();
+            WebExpressionVoter expressionVoter = new WebExpressionVoter();
+            AffirmativeBased adm = new AffirmativeBased(Arrays.<AccessDecisionVoter>asList(expressionVoter));
+            http
+                .authorizeRequests()
+                    .expressionHandler(handler)
+                    .accessDecisionManager(adm)
+                    .filterSecurityInterceptorOncePerRequest(true)
+                    .antMatchers("/a","/b").hasRole("ADMIN")
+                    .anyRequest().permitAll()
+                    .and()
+                .formLogin();
+        }
+    }
+}

config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationsTests.groovy

@@ -15,6 +15,8 @@
  */
 package org.springframework.security.config.annotation.web.configurers;
 
+import static org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurerConfigs.*
+
 import javax.servlet.http.HttpServletResponse
 
 import org.springframework.beans.factory.BeanCreationException
@@ -453,4 +455,11 @@ public class ExpressionUrlAuthorizationConfigurerTests extends BaseSpringSpec {
                 .inMemoryAuthentication()
         }
     }
+
+    def "All Properties are accessible and chain properly"() {
+        when:
+            loadConfig(AllPropertiesWorkConfig)
+        then:
+            noExceptionThrown()
+    }
 }

config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationsTests.groovy

@@ -72,7 +72,8 @@ public class UrlAuthorizationsTests extends BaseSpringSpec {
     static class NoSpecificAccessDecessionManagerConfig extends WebSecurityConfigurerAdapter {
         protected void configure(HttpSecurity http) throws Exception {
             http
-                .apply(new UrlAuthorizationConfigurer())
+                .apply(new UrlAuthorizationConfigurer()).getRegistry()
+                    .antMatchers("/a").hasRole("ADMIN")
                     .anyRequest().hasRole("USER")
         }
     }