Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-03-01 10:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

HttpSecurity comparitor->comparator

Browse Source 
Rename HttpSecurity's comparitor to comparator

Fixes gh-3810
This commit is contained in:
Rob Winch 2016-04-13 15:04:22 -05:00
parent a7fb6d2e58
commit 6f169267c4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
View File

@ -112,7 +112,7 @@ public final class HttpSecurity extends
private final RequestMatcherConfigurer requestMatcherConfigurer = new RequestMatcherConfigurer(); private final RequestMatcherConfigurer requestMatcherConfigurer = new RequestMatcherConfigurer();
private List<Filter> filters = new ArrayList<Filter>(); private List<Filter> filters = new ArrayList<Filter>();
private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE; private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
private FilterComparator comparitor = new FilterComparator(); private FilterComparator comparator = new FilterComparator();
/** /**
* Creates a new instance * Creates a new instance
@ -947,7 +947,7 @@ public final class HttpSecurity extends
@Override @Override
protected DefaultSecurityFilterChain performBuild() throws Exception { protected DefaultSecurityFilterChain performBuild() throws Exception {
Collections.sort(filters, comparitor); Collections.sort(filters, comparator);
return new DefaultSecurityFilterChain(requestMatcher, filters); return new DefaultSecurityFilterChain(requestMatcher, filters);
} }
@ -989,7 +989,7 @@ public final class HttpSecurity extends
* .servlet.Filter, java.lang.Class) * .servlet.Filter, java.lang.Class)
*/ */
public HttpSecurity addFilterAfter(Filter filter, Class<? extends Filter> afterFilter) { public HttpSecurity addFilterAfter(Filter filter, Class<? extends Filter> afterFilter) {
comparitor.registerAfter(filter.getClass(), afterFilter); comparator.registerAfter(filter.getClass(), afterFilter);
return addFilter(filter); return addFilter(filter);
} }
@ -1002,7 +1002,7 @@ public final class HttpSecurity extends
*/ */
public HttpSecurity addFilterBefore(Filter filter, public HttpSecurity addFilterBefore(Filter filter,
Class<? extends Filter> beforeFilter) { Class<? extends Filter> beforeFilter) {
comparitor.registerBefore(filter.getClass(), beforeFilter); comparator.registerBefore(filter.getClass(), beforeFilter);
return addFilter(filter); return addFilter(filter);
} }
@ -1015,7 +1015,7 @@ public final class HttpSecurity extends
*/ */
public HttpSecurity addFilter(Filter filter) { public HttpSecurity addFilter(Filter filter) {
Class<? extends Filter> filterClass = filter.getClass(); Class<? extends Filter> filterClass = filter.getClass();
if (!comparitor.isRegistered(filterClass)) { if (!comparator.isRegistered(filterClass)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The Filter class " "The Filter class "
+ filterClass.getName() + filterClass.getName()
@ -1040,7 +1040,7 @@ public final class HttpSecurity extends
* @return the {@link HttpSecurity} for further customizations * @return the {@link HttpSecurity} for further customizations
*/ */
public HttpSecurity addFilterAt(Filter filter, Class<? extends Filter> atFilter) { public HttpSecurity addFilterAt(Filter filter, Class<? extends Filter> atFilter) {
this.comparitor.registerAt(filter.getClass(), atFilter); this.comparator.registerAt(filter.getClass(), atFilter);
return addFilter(filter); return addFilter(filter);
} }