From fb1e4e5a84e4c3fee474ab62b1b5364abbbfea87 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Fri, 5 Dec 2008 19:08:18 +0000 Subject: [PATCH] CASC-71 removed Java 1.5 code --- .../cas/client/authentication/AuthenticationFilter.java | 4 ++-- .../java/org/jasig/cas/client/util/AbstractCasFilter.java | 2 +- .../jasig/cas/client/util/AbstractConfigurationFilter.java | 4 ++++ .../client/validation/AbstractTicketValidationFilter.java | 6 +++--- .../cas/client/validation/Cas10TicketValidationFilter.java | 2 +- .../Cas20ProxyReceivingTicketValidationFilter.java | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) 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 06c2ede..351cb47 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 @@ -59,9 +59,9 @@ public class AuthenticationFilter extends AbstractCasFilter { super.initInternal(filterConfig); setCasServerLoginUrl(getPropertyFromInitParams(filterConfig, "casServerLoginUrl", null)); log.trace("Loaded CasServerLoginUrl parameter: " + this.casServerLoginUrl); - setRenew(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); + setRenew(parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); log.trace("Loaded renew parameter: " + this.renew); - setGateway(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "gateway", "false"))); + setGateway(parseBoolean(getPropertyFromInitParams(filterConfig, "gateway", "false"))); log.trace("Loaded gateway parameter: " + this.gateway); final String gatewayStorageClass = getPropertyFromInitParams(filterConfig, "gatewayStorageClass", null); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java index 8a1c176..f1356c6 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java @@ -56,7 +56,7 @@ public abstract class AbstractCasFilter extends AbstractConfigurationFilter { log.trace("Loading artifact parameter name property: " + this.artifactParameterName); setServiceParameterName(getPropertyFromInitParams(filterConfig, "serviceParameterName", "service")); log.trace("Loading serviceParameterName property: " + this.serviceParameterName); - setEncodeServiceUrl(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "encodeServiceUrl", "true"))); + setEncodeServiceUrl(parseBoolean(getPropertyFromInitParams(filterConfig, "encodeServiceUrl", "true"))); log.trace("Loading encodeServiceUrl property: " + this.encodeServiceUrl); initInternal(filterConfig); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java index c196213..1e0af92 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java @@ -68,6 +68,10 @@ public abstract class AbstractConfigurationFilter implements Filter { return defaultValue; } + protected final boolean parseBoolean(final String value) { + return ((value != null) && value.equalsIgnoreCase("true")); + } + protected final String loadFromContext(final InitialContext context, String path) { try { return (String) context.lookup(path); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java index a12a30f..e761810 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java @@ -61,11 +61,11 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { protected void initInternal(final FilterConfig filterConfig) throws ServletException { super.initInternal(filterConfig); - setExceptionOnValidationFailure(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "exceptionOnValidationFailure", "true"))); + setExceptionOnValidationFailure(parseBoolean(getPropertyFromInitParams(filterConfig, "exceptionOnValidationFailure", "true"))); log.trace("Setting exceptionOnValidationFailure parameter: " + this.exceptionOnValidationFailure); - setRedirectAfterValidation(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "redirectAfterValidation", "true"))); + setRedirectAfterValidation(parseBoolean(getPropertyFromInitParams(filterConfig, "redirectAfterValidation", "true"))); log.trace("Setting redirectAfterValidation parameter: " + this.redirectAfterValidation); - setUseSession(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "useSession", "true"))); + setUseSession(parseBoolean(getPropertyFromInitParams(filterConfig, "useSession", "true"))); log.trace("Setting useSession parameter: " + this.useSession); setTicketValidator(getTicketValidator(filterConfig)); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java index 931faa6..4ccb03f 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java @@ -21,7 +21,7 @@ public class Cas10TicketValidationFilter extends AbstractTicketValidationFilter protected final TicketValidator getTicketValidator(final FilterConfig filterConfig) { final String casServerUrlPrefix = getPropertyFromInitParams(filterConfig, "casServerUrlPrefix", null); final Cas10TicketValidator validator = new Cas10TicketValidator(casServerUrlPrefix); - validator.setRenew(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); + validator.setRenew(parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); return validator; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java index b2e288d..858dd58 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java @@ -76,7 +76,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal if (CommonUtils.isNotBlank(allowAnyProxy) || CommonUtils.isNotBlank(allowedProxyChains)) { final Cas20ProxyTicketValidator v = new Cas20ProxyTicketValidator(casServerUrlPrefix); - v.setAcceptAnyProxy(Boolean.parseBoolean(allowAnyProxy)); + v.setAcceptAnyProxy(parseBoolean(allowAnyProxy)); v.setAllowedProxyChains(new ProxyList(constructListOfProxies(allowedProxyChains))); validator = v; } else { @@ -85,7 +85,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal validator.setProxyCallbackUrl(getPropertyFromInitParams(filterConfig, "proxyCallbackUrl", null)); validator.setProxyGrantingTicketStorage(this.proxyGrantingTicketStorage); validator.setProxyRetriever(new Cas20ProxyRetriever(casServerUrlPrefix)); - validator.setRenew(Boolean.parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); + validator.setRenew(parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false"))); final Map additionalParameters = new HashMap(); final List params = Arrays.asList(RESERVED_INIT_PARAMS);