[java-identity-provider] 01/02: CheckStyle

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6361d724ccacb50f7629b8bedee872c6bdfb807d

commit 6361d724ccacb50f7629b8bedee872c6bdfb807d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 3 16:52:12 2018 +0100

    CheckStyle
---
 .../cas/config/impl/AbstractProtocolConfiguration.java |  2 +-
 .../idp/cas/flow/impl/AbstractCASProtocolAction.java   |  2 --
 .../cas/flow/impl/BuildRelyingPartyContextAction.java  |  1 -
 .../idp/cas/service/impl/MetadataServiceRegistry.java  | 18 +++++++++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
index 7ea84d8..f6f8039 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
@@ -76,7 +76,7 @@ public abstract class AbstractProtocolConfiguration extends AbstractConditionalP
      * @param profileId Unique profile identifier.
      * @param ticketTTL Ticket validity period in milliseconds.
      */
-    public AbstractProtocolConfiguration(@Nonnull @NotEmpty final String profileId, @Positive long ticketTTL) {
+    public AbstractProtocolConfiguration(@Nonnull @NotEmpty final String profileId, @Positive final long ticketTTL) {
         super(profileId);
         resolveAttributesPredicate = Predicates.alwaysTrue();
         ticketValidityPeriod = ticketTTL;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractCASProtocolAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractCASProtocolAction.java
index a2be76d..eba2e3b 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractCASProtocolAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/AbstractCASProtocolAction.java
@@ -26,8 +26,6 @@ import net.shibboleth.idp.cas.service.ServiceContext;
 import net.shibboleth.idp.cas.ticket.Ticket;
 import net.shibboleth.idp.cas.ticket.TicketContext;
 import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.session.IdPSession;
-import net.shibboleth.idp.session.context.SessionContext;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
index d23eab8..9833e60 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
@@ -30,7 +30,6 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.webflow.execution.Event;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
index a525909..6ad20ee 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Two additional aspects of a CAS service may be specified in metadata:
  * <ol>
- *    <li><code>allowedToProxy</code> - True if there is an code>AssertionConsumerService</code> element with a
+ *    <li><code>allowedToProxy</code> - True if there is an <code>AssertionConsumerService</code> element with a
  *    binding of <code>{@value #PROXY_BINDING}</code>, false otherwise.</li>
  *    <li><code>singleLogoutParticipant</code> - True if there is a <code>SingleLogoutService</code> element with a
  *    binding of <code>{@value #LOGOUT_BINDING}</code> and a location of <code>{@value #LOGOUT_LOCATION}</code>,
@@ -110,7 +110,7 @@ public class MetadataServiceRegistry implements ServiceRegistry {
 
     @Nullable
     @Override
-    public Service lookup(@Nonnull String serviceURL) {
+    public Service lookup(final @Nonnull String serviceURL) {
         try {
             final List<EntityDescriptor> entities = Lists.newArrayList(metadataResolver.resolve(criteria(serviceURL)));
             if (entities.size() > 1) {
@@ -118,7 +118,7 @@ public class MetadataServiceRegistry implements ServiceRegistry {
             } else if (entities.size() == 1) {
                 return create(serviceURL, entities.get(0));
             }
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             log.warn("Metadata resolution failed for {}", serviceURL, e);
         }
         return null;
@@ -164,10 +164,14 @@ public class MetadataServiceRegistry implements ServiceRegistry {
         return service;
     }
 
+    /** Does the {@link EntityDescriptor} have a {@link MetadataServiceRegistry#PROXY_BINDING} acs. 
+     * @param entity  what to look at
+     * @return Whether is is authorized to proxy
+     */
     private boolean isAuthorizedToProxy(@Nonnull final EntityDescriptor entity) {
         final SPSSODescriptor descriptor = entity.getSPSSODescriptor(AbstractProtocolConfiguration.PROTOCOL_URI);
         if (descriptor != null) {
-            for (AssertionConsumerService acs : descriptor.getAssertionConsumerServices()) {
+            for (final AssertionConsumerService acs : descriptor.getAssertionConsumerServices()) {
                 if (PROXY_BINDING.equals(acs.getBinding())) {
                     return true;
                 }
@@ -176,10 +180,14 @@ public class MetadataServiceRegistry implements ServiceRegistry {
         return false;
     }
 
+    /** Does the {@link EntityDescriptor} has an SLO endpoint.
+     * @param entity what to look at
+     * @return whether it has an SLO endpoint
+     */
     private boolean hasSingleLogoutService(@Nonnull final EntityDescriptor entity) {
         final SPSSODescriptor descriptor = entity.getSPSSODescriptor(AbstractProtocolConfiguration.PROTOCOL_URI);
         if (descriptor != null) {
-            for (Endpoint endpoint : descriptor.getEndpoints(SingleLogoutService.DEFAULT_ELEMENT_NAME)) {
+            for (final Endpoint endpoint : descriptor.getEndpoints(SingleLogoutService.DEFAULT_ELEMENT_NAME)) {
                 if (LOGOUT_BINDING.equals(endpoint.getBinding()) && LOGOUT_LOCATION.equals(endpoint.getLocation())) {
                     return true;
                 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.