From 537aad6daa57b2fb9162cdb8dbfc2d693a5494b0 Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Thu, 31 Jan 2019 01:43:33 -0700 Subject: [PATCH] clean up --- .../PropertiesConfigurationStrategyImpl.java | 3 +-- .../org/jasig/cas/client/jaas/AssertionPrincipal.java | 2 +- .../java/org/jasig/cas/client/jaas/CasLoginModule.java | 8 ++++---- .../java/org/jasig/cas/client/jaas/TicketCredential.java | 2 +- .../cas/client/proxy/ProxyGrantingTicketStorage.java | 1 - .../cas/client/proxy/ProxyGrantingTicketStorageImpl.java | 3 +-- .../java/org/jasig/cas/client/proxy/ProxyRetriever.java | 1 - .../org/jasig/cas/client/session/SingleSignOutFilter.java | 2 +- .../org/jasig/cas/client/ssl/RegexHostnameVerifier.java | 2 +- .../jasig/cas/client/ssl/WhitelistHostnameVerifier.java | 2 +- .../java/org/jasig/cas/client/util/AbstractCasFilter.java | 2 +- .../java/org/jasig/cas/client/util/AssertionHolder.java | 1 - .../jasig/cas/client/util/AssertionThreadLocalFilter.java | 1 - .../main/java/org/jasig/cas/client/util/CommonUtils.java | 1 - .../java/org/jasig/cas/client/util/DelegatingFilter.java | 1 - .../cas/client/util/HttpServletRequestWrapperFilter.java | 1 - .../src/main/java/org/jasig/cas/client/util/XmlUtils.java | 1 - .../client/validation/Cas30ServiceTicketValidator.java | 1 - .../java/org/jasig/cas/client/PublicTestHttpServer.java | 3 +-- .../authentication/DefaultGatewayResolverImplTests.java | 1 - .../client/proxy/ProxyGrantingTicketStorageImplTest.java | 2 +- .../java/org/jasig/cas/client/util/CommonUtilsTests.java | 2 -- .../client/util/HttpServletRequestWrapperFilterTests.java | 1 - .../java/org/jasig/cas/client/util/URIBuilderTests.java | 1 - .../client/validation/AbstractTicketValidatorTests.java | 1 - .../jasig/cas/client/validation/AssertionImplTests.java | 1 - .../cas/client/validation/Cas10TicketValidatorTests.java | 2 -- .../client/validation/Cas20ProxyTicketValidatorTests.java | 1 - .../validation/Cas20ServiceTicketValidatorTests.java | 1 - .../validation/Cas30ServiceTicketValidatorTests.java | 6 ------ .../java/org/jasig/cas/client/jetty/CasAuthenticator.java | 2 +- .../java/org/jasig/cas/client/jetty/CasUserIdentity.java | 4 ++-- .../client/tomcat/PropertiesCasRealmDelegateTests.java | 2 +- .../cas/client/tomcat/v6/AbstractLifecycleValve.java | 2 +- .../jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java | 2 +- .../jasig/cas/client/tomcat/v85/Saml11Authenticator.java | 4 ---- .../jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java | 2 +- 43 files changed, 27 insertions(+), 60 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java index 5dd7dd9..64acea2 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java @@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory; import javax.servlet.Filter; import javax.servlet.FilterConfig; -import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; @@ -50,7 +49,7 @@ public final class PropertiesConfigurationStrategyImpl extends BaseConfiguration private String simpleFilterName; - private Properties properties = new Properties(); + private final Properties properties = new Properties(); @Override protected String get(final ConfigurationKey configurationKey) { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/AssertionPrincipal.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/AssertionPrincipal.java index 8ae5894..ff2baf5 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/AssertionPrincipal.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/AssertionPrincipal.java @@ -36,7 +36,7 @@ public class AssertionPrincipal extends SimplePrincipal implements Serializable private static final long serialVersionUID = 2288520214366461693L; /** CAS assertion describing authenticated state */ - private Assertion assertion; + private final Assertion assertion; /** * Creates a new principal containing the CAS assertion. diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java index 5deb87e..666b41f 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java @@ -162,7 +162,7 @@ public class CasLoginModule implements LoginModule { protected String[] defaultRoles; /** Names of attributes in the CAS assertion that should be used for role data */ - protected Set roleAttributeNames = new HashSet(); + protected final Set roleAttributeNames = new HashSet(); /** Name of JAAS Group containing caller principal */ protected String principalGroupName = DEFAULT_PRINCIPAL_GROUP_NAME; @@ -292,10 +292,10 @@ public class CasLoginModule implements LoginModule { try { this.callbackHandler.handle(new Callback[] { ticketCallback, serviceCallback }); } catch (final IOException e) { - logger.info("Login failed due to IO exception in callback handler: {}", e); + logger.info("Login failed due to IO exception in callback handler", e); throw (LoginException) new LoginException("IO exception in callback handler: " + e).initCause(e); } catch (final UnsupportedCallbackException e) { - logger.info("Login failed due to unsupported callback: {}", e); + logger.info("Login failed due to unsupported callback", e); throw (LoginException) new LoginException( "Callback handler does not support PasswordCallback and TextInputCallback.").initCause(e); } @@ -325,7 +325,7 @@ public class CasLoginModule implements LoginModule { this.assertion = this.ticketValidator.validate(this.ticket.getName(), service); } catch (final Exception e) { - logger.info("Login failed due to CAS ticket validation failure: {}", e); + logger.info("Login failed due to CAS ticket validation failure", e); throw (LoginException) new LoginException("CAS ticket validation failed: " + e).initCause(e); } } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java index 621da53..91f2c0d 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java @@ -34,7 +34,7 @@ public final class TicketCredential implements Principal { private static final int HASHCODE_SEED = 17; /** Ticket ID string */ - private String ticket; + private final String ticket; /** * Creates a new instance that wraps the given ticket. diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java index 0dc15c6..d7b6df9 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java @@ -23,7 +23,6 @@ package org.jasig.cas.client.proxy; * them to a specific ProxyGrantingTicketIou. * * @author Scott Battaglia - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public interface ProxyGrantingTicketStorage { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java index 727eede..1b6b2d0 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java @@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory; * * @author Scott Battaglia * @author Brad Cupit (brad [at] lsu {dot} edu) - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicketStorage { @@ -57,7 +56,7 @@ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicket * * @see ProxyGrantingTicketStorageImpl#DEFAULT_TIMEOUT */ - private long timeout; + private final long timeout; /** * Constructor set the timeout to the default value. diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java index 07e01a4..db26b87 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java @@ -25,7 +25,6 @@ import java.io.Serializable; * implementation a black box to the client. * * @author Scott Battaglia - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public interface ProxyRetriever extends Serializable { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java index ae511ba..1729103 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java @@ -39,7 +39,7 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { private static final SingleSignOutHandler HANDLER = new SingleSignOutHandler(); - private AtomicBoolean handlerInitialized = new AtomicBoolean(false); + private final AtomicBoolean handlerInitialized = new AtomicBoolean(false); public void init(final FilterConfig filterConfig) throws ServletException { super.init(filterConfig); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java index a13c9f7..14088ef 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java @@ -38,7 +38,7 @@ public final class RegexHostnameVerifier implements HostnameVerifier, Serializab private static final long serialVersionUID = 1L; /** Allowed hostname pattern */ - private Pattern pattern; + private final Pattern pattern; /** * Creates a new instance using the given regular expression. diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java index c882225..93740d3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java @@ -35,7 +35,7 @@ public final class WhitelistHostnameVerifier implements HostnameVerifier, Serial private static final long serialVersionUID = 1L; /** Allowed hosts */ - private String[] allowedHosts; + private final String[] allowedHosts; /** * Creates a new instance using the given array of allowed hosts. 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 9b48296..d227271 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 @@ -45,7 +45,7 @@ public abstract class AbstractCasFilter extends AbstractConfigurationFilter { /** Represents the constant for where the assertion will be located in memory. */ public static final String CONST_CAS_ASSERTION = "_const_cas_assertion_"; - private Protocol protocol; + private final Protocol protocol; /** Sets where response.encodeUrl should be called on service urls when constructed. */ private boolean encodeServiceUrl = true; diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionHolder.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionHolder.java index 842a268..f732e94 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionHolder.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionHolder.java @@ -24,7 +24,6 @@ import org.jasig.cas.client.validation.Assertion; * Static holder that places Assertion in a ThreadLocal. * * @author Scott Battaglia - * @version $Revision: 11728 $ $Date: 2007-09-26 14:20:43 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public class AssertionHolder { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java index 9cae17d..49b17c8 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java @@ -28,7 +28,6 @@ import org.jasig.cas.client.validation.Assertion; * Places the assertion in a ThreadLocal such that other resources can access it that do not have access to the web tier session. * * @author Scott Battaglia - * @version $Revision: 11728 $ $Date: 2007-09-26 14:20:43 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public final class AssertionThreadLocalFilter implements Filter { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java index eb354be..cabb34b 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java @@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory; * Common utilities so that we don't need to include Commons Lang. * * @author Scott Battaglia - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public final class CommonUtils { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java index c25ff0c..12d0c31 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; * the associated filter is executed. Otherwise, the normal chain is executed. * * @author Scott Battaglia - * @version $Revision: 11729 $ $Date: 2006-09-26 14:22:30 -0400 (Tue, 26 Sep 2006) $ * @since 3.0 */ public final class DelegatingFilter implements Filter { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java index a474a83..3c19670 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java @@ -44,7 +44,6 @@ import org.jasig.cas.client.validation.Assertion; * * @author Scott Battaglia * @author Marvin S. Addison - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public final class HttpServletRequestWrapperFilter extends AbstractConfigurationFilter { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java index 77831f4..219a340 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java @@ -39,7 +39,6 @@ import javax.xml.parsers.SAXParserFactory; * Common utilities for easily parsing XML without duplicating logic. * * @author Scott Battaglia - * @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $ * @since 3.0 */ public final class XmlUtils { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidator.java index 5780cbf..2759048 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidator.java @@ -24,7 +24,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java b/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java index 63eb059..2e831cb 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; /** * @author Scott Battaglia - * @version $Revision: 11721 $ $Date: 2007-08-09 15:17:44 -0400 (Wed, 09 Aug 2007) $ * @since 3.0 */ public final class PublicTestHttpServer extends Thread { @@ -47,7 +46,7 @@ public final class PublicTestHttpServer extends Thread { private final CountDownLatch ready = new CountDownLatch(1); - private static Map serverMap = new HashMap(); + private static final Map serverMap = new HashMap(); private PublicTestHttpServer(String data, String encoding, String MIMEType, int port) throws UnsupportedEncodingException { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImplTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImplTests.java index f8e75e6..241f834 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImplTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImplTests.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; public class DefaultGatewayResolverImplTests { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTest.java b/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTest.java index 465885c..03cfdd0 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTest.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTest.java @@ -30,7 +30,7 @@ public class ProxyGrantingTicketStorageImplTest { private static final int TIME_OUT = 250; - private ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl(TIME_OUT); + private final ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl(TIME_OUT); @Test public void cleanUp() throws Exception { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java index 0e78f1a..e060662 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; import org.jasig.cas.client.Protocol; import org.jasig.cas.client.PublicTestHttpServer; import org.jasig.cas.client.ssl.HttpsURLConnectionFactory; -import org.junit.Ignore; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -34,7 +33,6 @@ import java.util.Collection; * Tests for the CommonUtils. * * @author Scott Battaglia - * @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $ * @since 3.0 */ public final class CommonUtilsTests extends TestCase { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java index addd389..76b7964 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java @@ -40,7 +40,6 @@ import org.springframework.mock.web.MockHttpSession; * Tests for the HttpServletRequestWrapperFilter. * * @author Scott Battaglia - * @version $Revision: 11742 $ $Date: 2007-10-05 14:03:58 -0400 (Thu, 05 Oct 2007) $ * @since 3.0 */ diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/util/URIBuilderTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/util/URIBuilderTests.java index df6c7ed..9dd2d05 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/util/URIBuilderTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/util/URIBuilderTests.java @@ -43,7 +43,6 @@ import org.junit.Test; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.*; diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java index 77af2b8..1e8a819 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java @@ -22,7 +22,6 @@ package org.jasig.cas.client.validation; * Base class for all TicketValidator tests to inherit from. * * @author Scott Battaglia - * @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $ * @since 3.0 */ public abstract class AbstractTicketValidatorTests { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java index 335dbe6..0793a5c 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java @@ -29,7 +29,6 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl; * Test cases for the {@link AssertionImpl}. * * @author Scott Battaglia - * @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $ * @since 3.0 */ public final class AssertionImplTests extends TestCase { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java index 85d8779..53b1dad 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java @@ -21,7 +21,6 @@ package org.jasig.cas.client.validation; import static org.junit.Assert.*; import java.io.UnsupportedEncodingException; import org.jasig.cas.client.PublicTestHttpServer; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; @@ -29,7 +28,6 @@ import org.junit.Test; * Test cases for the {@link Cas10TicketValidator}. * * @author Scott Battaglia - * @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $ * @since 3.0 */ public final class Cas10TicketValidatorTests extends AbstractTicketValidatorTests { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java index b0db574..59d630b 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java @@ -35,7 +35,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * Test cases for the {@link Cas20ProxyTicketValidator}. * * @author Scott Battaglia - * @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $ * @since 3.0 */ public final class Cas20ProxyTicketValidatorTests extends AbstractTicketValidatorTests { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java index f573888..d4c8cab 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java @@ -32,7 +32,6 @@ import org.junit.Test; * Test cases for the {@link Cas20ServiceTicketValidator}. * * @author Scott Battaglia - * @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $ * @since 3.0 */ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValidatorTests { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java index 748899d..fa87e57 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java @@ -34,7 +34,6 @@ import static org.junit.Assert.*; * Test cases for the {@link Cas20ServiceTicketValidator}. * * @author Scott Battaglia - * @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $ * @since 3.0 */ public final class Cas30ServiceTicketValidatorTests extends AbstractTicketValidatorTests { @@ -49,11 +48,6 @@ public final class Cas30ServiceTicketValidatorTests extends AbstractTicketValida super(); } - /*@AfterClass - public static void classCleanUp() { - server.shutdown(); - } */ - @Before public void setUp() throws Exception { this.proxyGrantingTicketStorage = getProxyGrantingTicketStorage(); diff --git a/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthenticator.java b/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthenticator.java index 21d4c51..81477ae 100644 --- a/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthenticator.java +++ b/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthenticator.java @@ -241,7 +241,7 @@ public class CasAuthenticator extends AbstractLifeCycle implements Authenticator logger.debug("Redirecting to {}", redirectUrl); response.sendRedirect(redirectUrl); } catch (IOException e) { - logger.debug("Redirect to CAS failed with error: {}", e); + logger.debug("Redirect to CAS failed with error", e); throw new ServerAuthException("Redirect to CAS failed", e); } } diff --git a/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasUserIdentity.java b/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasUserIdentity.java index aee4212..cd65a28 100644 --- a/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasUserIdentity.java +++ b/cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasUserIdentity.java @@ -17,10 +17,10 @@ import java.util.Collection; public class CasUserIdentity implements UserIdentity { /** CAS principal. */ - private AttributePrincipal principal; + private final AttributePrincipal principal; /** Assertion attribute containing role data. */ - private String roleAttribute; + private final String roleAttribute; /** diff --git a/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java b/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java index 9f0ae2d..d4ee60a 100644 --- a/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java +++ b/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl; * */ public class PropertiesCasRealmDelegateTests extends TestCase { - private PropertiesCasRealmDelegate realm = new PropertiesCasRealmDelegate(); + private final PropertiesCasRealmDelegate realm = new PropertiesCasRealmDelegate(); /** {@inheritDoc} */ protected void setUp() throws Exception { diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java index 3f85114..2ccb215 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java @@ -40,7 +40,7 @@ public abstract class AbstractLifecycleValve extends ValveBase implements Lifecy protected final Logger logger = LoggerFactory.getLogger(getClass()); /** Lifecycle listeners */ - private LifecycleSupport lifecycle = new LifecycleSupport(this); + private final LifecycleSupport lifecycle = new LifecycleSupport(this); /** {@inheritDoc} */ public void addLifecycleListener(final LifecycleListener listener) { diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java index bcdea80..87545dd 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java @@ -34,7 +34,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { private static final String NAME = RegexUriLogoutValve.class.getName(); - private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); + private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java index d1167c4..4e877ba 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java @@ -34,7 +34,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { private static final String NAME = StaticUriLogoutValve.class.getName(); - private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); + private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java index f97426c..40f086b 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler; */ public final class RegexUriLogoutValve extends AbstractLogoutValve { - private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); + private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java index cc7dd0d..4585719 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler; */ public final class StaticUriLogoutValve extends AbstractLogoutValve { - private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); + private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java index fc8999f..914df6a 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler; */ public final class RegexUriLogoutValve extends AbstractLogoutValve { - private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); + private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java index 516f331..83a49ea 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler; */ public final class StaticUriLogoutValve extends AbstractLogoutValve { - private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); + private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java index 9921a8f..7caaec0 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler; */ public final class RegexUriLogoutValve extends AbstractLogoutValve { - private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); + private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java index bc550b6..c1a07dd 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java @@ -19,13 +19,9 @@ package org.jasig.cas.client.tomcat.v85; import org.apache.catalina.LifecycleException; -import org.apache.catalina.connector.Request; import org.jasig.cas.client.validation.Saml11TicketValidator; import org.jasig.cas.client.validation.TicketValidator; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * CAS authenticator that uses the SAML 1.1 protocol. * diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java index a9624b7..dbaf150 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java @@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler; */ public final class StaticUriLogoutValve extends AbstractLogoutValve { - private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); + private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); public void setRedirectUrl(final String redirectUrl) { this.logoutHandler.setRedirectUrl(redirectUrl);