From 5cd43c2139e8ff2054f8666687a234a983f44798 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Mon, 12 Sep 2011 04:12:37 +0000 Subject: [PATCH] CASC-101 additional protected getters --- .../AbstractUrlBasedTicketValidator.java | 14 +++++++++++++- .../validation/Cas20ProxyTicketValidator.java | 10 +++++++--- .../validation/Cas20ServiceTicketValidator.java | 14 +++++++++++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java index ea6195e..0012b5e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java @@ -194,7 +194,7 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator protected abstract String retrieveResponseFromServer(URL validationUrl, String ticket); - public Assertion validate(final String ticket, final String service) throws TicketValidationException { + public final Assertion validate(final String ticket, final String service) throws TicketValidationException { final String validationUrl = constructValidationUrl(ticket, service); @@ -239,4 +239,16 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator protected final String getEncoding() { return this.encoding; } + + protected final boolean isRenew() { + return this.renew; + } + + protected final String getCasServerUrlPrefix() { + return this.casServerUrlPrefix; + } + + protected final Map getCustomParameters() { + return this.customParameters; + } } \ No newline at end of file diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java index 2b4d8d1..cea0a26 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java @@ -41,7 +41,7 @@ public class Cas20ProxyTicketValidator extends Cas20ServiceTicketValidator { super(casServerUrlPrefix); } - public ProxyList getAllowedProxyChains() { + protected final ProxyList getAllowedProxyChains() { return this.allowedProxyChains; } @@ -65,11 +65,15 @@ public class Cas20ProxyTicketValidator extends Cas20ServiceTicketValidator { throw new InvalidProxyChainTicketValidationException("Invalid proxy chain: " + proxies.toString()); } - public void setAcceptAnyProxy(final boolean acceptAnyProxy) { + public final void setAcceptAnyProxy(final boolean acceptAnyProxy) { this.acceptAnyProxy = acceptAnyProxy; } - public void setAllowedProxyChains(final ProxyList allowedProxyChains) { + public final void setAllowedProxyChains(final ProxyList allowedProxyChains) { this.allowedProxyChains = allowedProxyChains; } + + protected boolean isAcceptAnyProxy() { + return this.acceptAnyProxy; + } } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java index a51e27a..c007282 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java @@ -184,5 +184,17 @@ public class Cas20ServiceTicketValidator extends AbstractCasProtocolUrlBasedTick public final void setProxyRetriever(final ProxyRetriever proxyRetriever) { this.proxyRetriever = proxyRetriever; - } + } + + protected final String getProxyCallbackUrl() { + return this.proxyCallbackUrl; + } + + protected final ProxyGrantingTicketStorage getProxyGrantingTicketStorage() { + return this.proxyGrantingTicketStorage; + } + + protected final ProxyRetriever getProxyRetriever() { + return this.proxyRetriever; + } }