CASC-180: Renamed factory to be HttpURLConnectionFactory.
This commit is contained in:
parent
2e6df8c5b7
commit
4f79cd1014
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
package org.jasig.cas.client.proxy;
|
||||
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
import org.jasig.cas.client.util.CommonUtils;
|
||||
import org.jasig.cas.client.util.XmlUtils;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -59,7 +59,7 @@ public final class Cas20ProxyRetriever implements ProxyRetriever {
|
|||
private final String encoding;
|
||||
|
||||
/** Url connection factory to use when communicating with the server **/
|
||||
private final URLConnectionFactory urlConnectionFactory;
|
||||
private final HttpURLConnectionFactory urlConnectionFactory;
|
||||
|
||||
/**
|
||||
* Main Constructor.
|
||||
|
|
@ -68,7 +68,7 @@ public final class Cas20ProxyRetriever implements ProxyRetriever {
|
|||
* @param encoding the encoding to use.
|
||||
* @param urlFactory url connection factory use when retrieving proxy responses from the server
|
||||
*/
|
||||
public Cas20ProxyRetriever(final String casServerUrl, final String encoding, final URLConnectionFactory urlFactory) {
|
||||
public Cas20ProxyRetriever(final String casServerUrl, final String encoding, final HttpURLConnectionFactory urlFactory) {
|
||||
CommonUtils.assertNotNull(casServerUrl, "casServerUrl cannot be null.");
|
||||
this.casServerUrl = casServerUrl;
|
||||
this.encoding = encoding;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import java.net.URLConnection;
|
|||
* @author Misagh Moayyed
|
||||
* @since 3.3
|
||||
*/
|
||||
public interface URLConnectionFactory {
|
||||
public interface HttpURLConnectionFactory {
|
||||
|
||||
/**
|
||||
* Receives a {@link URLConnection} instance typically as a result of a {@link URL}
|
||||
|
|
@ -18,7 +18,7 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* An implementation of the {@link URLConnectionFactory} whose responsible to configure
|
||||
* An implementation of the {@link HttpURLConnectionFactory} whose responsible to configure
|
||||
* the underlying <i>https</i> connection, if needed, with a given hostname and SSL socket factory based on the
|
||||
* configuration provided.
|
||||
*
|
||||
|
|
@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
|
|||
* @see #setHostnameVerifier(HostnameVerifier)
|
||||
* @see #setSSLConfiguration(Properties)
|
||||
*/
|
||||
public final class HttpsURLConnectionFactory implements URLConnectionFactory {
|
||||
public final class HttpsURLConnectionFactory implements HttpURLConnectionFactory {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(HttpsURLConnectionFactory.class);
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.jasig.cas.client.util;
|
|||
|
||||
import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
|
||||
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
import org.jasig.cas.client.validation.ProxyList;
|
||||
import org.jasig.cas.client.validation.ProxyListEditor;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -329,7 +329,7 @@ public final class CommonUtils {
|
|||
* @param encoding the encoding to use.
|
||||
* @return the response.
|
||||
*/
|
||||
public static String getResponseFromServer(final URL constructedUrl, final URLConnectionFactory factory, final String encoding) {
|
||||
public static String getResponseFromServer(final URL constructedUrl, final HttpURLConnectionFactory factory, final String encoding) {
|
||||
|
||||
HttpURLConnection conn = null;
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
package org.jasig.cas.client.validation;
|
||||
|
||||
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
import org.jasig.cas.client.util.CommonUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
@ -45,7 +45,7 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator
|
|||
* URLConnection factory instance to use when making validation requests to the CAS server.
|
||||
* Defaults to {@link HttpsURLConnectionFactory}
|
||||
*/
|
||||
private URLConnectionFactory urlConnectionFactory = new HttpsURLConnectionFactory();
|
||||
private HttpURLConnectionFactory urlConnectionFactory = new HttpsURLConnectionFactory();
|
||||
|
||||
/**
|
||||
* Prefix for the CAS server. Should be everything up to the url endpoint, including the /.
|
||||
|
|
@ -238,11 +238,11 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator
|
|||
return this.customParameters;
|
||||
}
|
||||
|
||||
protected URLConnectionFactory getURLConnectionFactory() {
|
||||
protected HttpURLConnectionFactory getURLConnectionFactory() {
|
||||
return this.urlConnectionFactory;
|
||||
}
|
||||
|
||||
public void setURLConnectionFactory(final URLConnectionFactory urlConnectionFactory) {
|
||||
public void setURLConnectionFactory(final HttpURLConnectionFactory urlConnectionFactory) {
|
||||
this.urlConnectionFactory = urlConnectionFactory;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.jasig.cas.client.validation;
|
|||
import javax.servlet.FilterConfig;
|
||||
|
||||
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
|
||||
/**
|
||||
* Implementation of AbstractTicketValidatorFilter that instanciates a Cas10TicketValidator.
|
||||
|
|
@ -39,7 +39,7 @@ public class Cas10TicketValidationFilter extends AbstractTicketValidationFilter
|
|||
final Cas10TicketValidator validator = new Cas10TicketValidator(casServerUrlPrefix);
|
||||
validator.setRenew(parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false")));
|
||||
|
||||
final URLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
final HttpURLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
validator.setURLConnectionFactory(factory);
|
||||
validator.setEncoding(getPropertyFromInitParams(filterConfig, "encoding", null));
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
|
||||
import org.jasig.cas.client.proxy.*;
|
||||
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
import org.jasig.cas.client.util.CommonUtils;
|
||||
import org.jasig.cas.client.util.ReflectUtils;
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal
|
|||
validator.setProxyCallbackUrl(getPropertyFromInitParams(filterConfig, "proxyCallbackUrl", null));
|
||||
validator.setProxyGrantingTicketStorage(this.proxyGrantingTicketStorage);
|
||||
|
||||
final URLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
final HttpURLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
validator.setURLConnectionFactory(factory);
|
||||
|
||||
validator.setProxyRetriever(new Cas20ProxyRetriever(casServerUrlPrefix, getPropertyFromInitParams(filterConfig, "encoding", null), factory));
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import javax.servlet.FilterConfig;
|
|||
import javax.servlet.ServletException;
|
||||
|
||||
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.URLConnectionFactory;
|
||||
import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
|
||||
|
||||
/**
|
||||
* Implementation of TicketValidationFilter that can instanciate a SAML 1.1 Ticket Validator.
|
||||
|
|
@ -57,7 +57,7 @@ public class Saml11TicketValidationFilter extends AbstractTicketValidationFilter
|
|||
validator.setTolerance(Long.parseLong(tolerance));
|
||||
validator.setRenew(parseBoolean(getPropertyFromInitParams(filterConfig, "renew", "false")));
|
||||
|
||||
final URLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
final HttpURLConnectionFactory factory = new HttpsURLConnectionFactory(getHostnameVerifier(filterConfig), getSSLConfig(filterConfig));
|
||||
validator.setURLConnectionFactory(factory);
|
||||
|
||||
validator.setEncoding(getPropertyFromInitParams(filterConfig, "encoding", null));
|
||||
|
|
|
|||
Loading…
Reference in New Issue