From 6f169267c4056537bfa5bbd8f26369cad372d9f9 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 13 Apr 2016 15:04:22 -0500 Subject: [PATCH] HttpSecurity comparitor->comparator Rename HttpSecurity's comparitor to comparator Fixes gh-3810 --- .../config/annotation/web/builders/HttpSecurity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 0d68542790..a2601a5ac5 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -112,7 +112,7 @@ public final class HttpSecurity extends private final RequestMatcherConfigurer requestMatcherConfigurer = new RequestMatcherConfigurer(); private List filters = new ArrayList(); private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE; - private FilterComparator comparitor = new FilterComparator(); + private FilterComparator comparator = new FilterComparator(); /** * Creates a new instance @@ -947,7 +947,7 @@ public final class HttpSecurity extends @Override protected DefaultSecurityFilterChain performBuild() throws Exception { - Collections.sort(filters, comparitor); + Collections.sort(filters, comparator); return new DefaultSecurityFilterChain(requestMatcher, filters); } @@ -989,7 +989,7 @@ public final class HttpSecurity extends * .servlet.Filter, java.lang.Class) */ public HttpSecurity addFilterAfter(Filter filter, Class afterFilter) { - comparitor.registerAfter(filter.getClass(), afterFilter); + comparator.registerAfter(filter.getClass(), afterFilter); return addFilter(filter); } @@ -1002,7 +1002,7 @@ public final class HttpSecurity extends */ public HttpSecurity addFilterBefore(Filter filter, Class beforeFilter) { - comparitor.registerBefore(filter.getClass(), beforeFilter); + comparator.registerBefore(filter.getClass(), beforeFilter); return addFilter(filter); } @@ -1015,7 +1015,7 @@ public final class HttpSecurity extends */ public HttpSecurity addFilter(Filter filter) { Class filterClass = filter.getClass(); - if (!comparitor.isRegistered(filterClass)) { + if (!comparator.isRegistered(filterClass)) { throw new IllegalArgumentException( "The Filter class " + filterClass.getName() @@ -1040,7 +1040,7 @@ public final class HttpSecurity extends * @return the {@link HttpSecurity} for further customizations */ public HttpSecurity addFilterAt(Filter filter, Class atFilter) { - this.comparitor.registerAt(filter.getClass(), atFilter); + this.comparator.registerAt(filter.getClass(), atFilter); return addFilter(filter); }