From 88789ef358d0fb705d948ded964dbcacb190dddd Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Wed, 17 May 2017 16:00:24 -0700 Subject: [PATCH] allow extension points for JSON validation parsing. add filter and validator --- .../cas/client/validation/Cas20ProxyTicketValidator.java | 2 +- .../validation/json/Cas30JsonProxyTicketValidator.java | 6 +----- .../validation/json/JsonValidationResponseParser.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) 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 96f8854..289c402 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 @@ -28,7 +28,7 @@ import org.jasig.cas.client.util.XmlUtils; * @author Scott Battaglia * @since 3.1 */ -public class Cas20ProxyTicketValidator extends Cas20ServiceTicketValidator implements ProxyTicketValidator { +public class Cas20ProxyTicketValidator extends Cas20ServiceTicketValidator { private boolean acceptAnyProxy; diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/Cas30JsonProxyTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/Cas30JsonProxyTicketValidator.java index 8ef4d80..43dcc89 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/Cas30JsonProxyTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/Cas30JsonProxyTicketValidator.java @@ -1,19 +1,15 @@ package org.jasig.cas.client.validation.json; import org.jasig.cas.client.validation.Assertion; -import org.jasig.cas.client.validation.Cas30ProxyTicketValidator; -import org.jasig.cas.client.validation.ProxyTicketValidator; import org.jasig.cas.client.validation.TicketValidationException; -import java.util.List; - /** * This is {@link Cas30JsonProxyTicketValidator} that attempts to parse the CAS validation response * as JSON. Very similar to {@link Cas30JsonServiceTicketValidator}, it also honors proxies as the name suggests. * * @author Misagh Moayyed */ -public class Cas30JsonProxyTicketValidator extends Cas30JsonServiceTicketValidator implements ProxyTicketValidator { +public class Cas30JsonProxyTicketValidator extends Cas30JsonServiceTicketValidator { public Cas30JsonProxyTicketValidator(final String casServerUrlPrefix) { super(casServerUrlPrefix); getCustomParameters().put("format", "JSON"); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/JsonValidationResponseParser.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/JsonValidationResponseParser.java index 1977c3a..2cf1f05 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/JsonValidationResponseParser.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/json/JsonValidationResponseParser.java @@ -19,9 +19,7 @@ final class JsonValidationResponseParser { this.objectMapper = new ObjectMapper(); this.objectMapper.findAndRegisterModules(); } - - - + public TicketValidationJsonResponse parse(final String response) throws TicketValidationException { try { final TicketValidationJsonResponse json = this.objectMapper.readValue(response, TicketValidationJsonResponse.class);