From 00ee9e378dfaa89557b1eb74c0bfd76681b670dd Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Wed, 12 Mar 2014 07:37:59 -0700 Subject: [PATCH] CASC-219: renamed matcher class to match behavior --- .../jasig/cas/client/authentication/AuthenticationFilter.java | 2 +- ...ategy.java => ContainsPatternUrlPatternMatcherStrategy.java} | 2 +- .../cas/client/authentication/AuthenticationFilterTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename cas-client-core/src/main/java/org/jasig/cas/client/authentication/{ExactUrlPatternMatcherStrategy.java => ContainsPatternUrlPatternMatcherStrategy.java} (92%) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java index c7e225d..8ab5d81 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java @@ -75,7 +75,7 @@ public class AuthenticationFilter extends AbstractCasFilter { new HashMap>(); static { - PATTERN_MATCHER_TYPES.put("EXACT", ExactUrlPatternMatcherStrategy.class); + PATTERN_MATCHER_TYPES.put("EXACT", ContainsPatternUrlPatternMatcherStrategy.class); PATTERN_MATCHER_TYPES.put("REGEX", RegexUrlPatternMatcherStrategy.class); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java similarity index 92% rename from cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java rename to cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java index befe6ee..1532481 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java @@ -24,7 +24,7 @@ package org.jasig.cas.client.authentication; * @author Misagh Moayyed * @since 3.3.1 */ -public class ExactUrlPatternMatcherStrategy implements UrlPatternMatcherStrategy { +public class ContainsPatternUrlPatternMatcherStrategy implements UrlPatternMatcherStrategy { private String pattern; diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java index d006188..d5cffe6 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java @@ -280,7 +280,7 @@ public final class AuthenticationFilterTests { context.addInitParameter("casServerLoginUrl", CAS_LOGIN_URL); context.addInitParameter("ignorePattern", "=valueToIgnore"); - context.addInitParameter("ignoreUrlPatternType", ExactUrlPatternMatcherStrategy.class.getName()); + context.addInitParameter("ignoreUrlPatternType", ContainsPatternUrlPatternMatcherStrategy.class.getName()); context.addInitParameter("service", CAS_SERVICE_URL); f.init(new MockFilterConfig(context));