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

SEC-2357: Move *RequestMatcher to .matcher package

Browse Source
This commit is contained in:
Rob Winch
2013-10-14 11:55:56 -05:00
parent 45ad74a0bd
commit 51171efa7a
93 changed files with 239 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
View File

@@ -14,7 +14,7 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.firewall.FirewalledRequest;
import org.springframework.security.web.firewall.HttpFirewall;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import javax.servlet.Filter;
import javax.servlet.FilterChain;

4
web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java
View File

@@ -7,8 +7,8 @@ import org.junit.Test;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.SecurityConfig;
import org.springframework.security.web.FilterInvocation;
import org.springframework.security.web.util.matchers.AnyRequestMatcher;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import java.util.Collection;
import java.util.LinkedHashMap;

4
web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
View File

@@ -29,8 +29,8 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.SecurityConfig;
import org.springframework.security.web.FilterInvocation;
import org.springframework.security.web.util.matchers.AntPathRequestMatcher;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
/**
* Tests {@link DefaultFilterInvocationSecurityMetadataSource}.

2
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
View File

@@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
/**
* Test class for {@link DelegatingAuthenticationEntryPoint}

2
web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java
View File

@@ -41,7 +41,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
/**
* @author Rob Winch

2
web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java
View File

@@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.web.header.HeaderWriter;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
/**
* @author Rob Winch

2
web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
View File

@@ -22,7 +22,7 @@ import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.web.header.writers.HstsHeaderWriter;
import org.springframework.security.web.util.matchers.AnyRequestMatcher;
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
/**
* @author Rob Winch

2
web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java
View File

@@ -17,7 +17,7 @@ import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.web.PortResolverImpl;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
/**
*

6
web/src/test/java/org/springframework/security/web/util/matchers/AndRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Mockito.when;
@@ -28,8 +28,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matchers.AndRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.security.web.util.matcher.AndRequestMatcher;
/**
*

6
web/src/test/java/org/springframework/security/web/util/matchers/AntPathRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
View File

@@ -10,7 +10,7 @@
* 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.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
@@ -25,8 +25,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.AntPathRequestMatcher;
import org.springframework.security.web.util.matchers.AnyRequestMatcher;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
/**
* @author Luke Taylor

4
web/src/test/java/org/springframework/security/web/util/matchers/ELRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java
View File

@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.ELRequestMatcher;
import org.springframework.security.web.util.matcher.ELRequestMatcher;
/**
* @author Mike Wiesner

4
web/src/test/java/org/springframework/security/web/util/matchers/IpAddressMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.junit.Assert.*;
@@ -6,7 +6,7 @@ import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.IpAddressMatcher;
import org.springframework.security.web.util.matcher.IpAddressMatcher;
/**

4
web/src/test/java/org/springframework/security/web/util/matchers/MediaTypeRequestMatcherRequestHCNSTests.java → web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.MediaTypeRequestMatcher;
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
import org.springframework.web.accept.ContentNegotiationStrategy;
import org.springframework.web.accept.HeaderContentNegotiationStrategy;

4
web/src/test/java/org/springframework/security/web/util/matchers/MediaTypeRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Matchers.any;
@@ -30,7 +30,7 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.MediaTypeRequestMatcher;
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.accept.ContentNegotiationStrategy;
import org.springframework.web.context.request.NativeWebRequest;

6
web/src/test/java/org/springframework/security/web/util/matchers/NegatedRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Mockito.when;
@@ -24,8 +24,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matchers.NegatedRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
/**
*

6
web/src/test/java/org/springframework/security/web/util/matchers/OrRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Mockito.when;
@@ -28,8 +28,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.security.web.util.RequestMatcher;
import org.springframework.security.web.util.matchers.OrRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.security.web.util.matcher.OrRequestMatcher;
/**
*

4
web/src/test/java/org/springframework/security/web/util/matchers/RegexRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java
View File

@@ -10,7 +10,7 @@
* 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.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.RegexRequestMatcher;
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
/**
* @author Luke Taylor

4
web/src/test/java/org/springframework/security/web/util/matchers/RequestHeaderRequestMatcherTests.java → web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java
View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.util.matchers;
package org.springframework.security.web.util.matcher;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matchers.RequestHeaderRequestMatcher;
import org.springframework.security.web.util.matcher.RequestHeaderRequestMatcher;
/**
*