[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIX...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 11 21:50:10 2014
New Revision: 7072

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7072&view=rev
Log:
Use abstract base class.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java?rev=7072&r1=7071&r2=7072&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java Thu Dec 11 21:50:10 2014
@@ -31,9 +31,8 @@
 import net.shibboleth.idp.saml.security.KeyAuthoritySupport;
 import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
 import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -67,52 +66,39 @@
  * Resolution of trusted names for an entity is also supported, based on {@link org.opensaml.xmlsec.signature.KeyName}
  * information contained within the {@link KeyInfo} of a role descriptor's {@link KeyDescriptor} element.
  */
-public class MetadataPKIXValidationInformationResolver implements PKIXValidationInformationResolver,
-        InitializableComponent {
+public class MetadataPKIXValidationInformationResolver extends AbstractInitializableComponent
+        implements PKIXValidationInformationResolver {
 
     /** Default value for Shibboleth KeyAuthority verify depth. */
     public static final int KEY_AUTHORITY_VERIFY_DEPTH_DEFAULT = 1;
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MetadataPKIXValidationInformationResolver.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(MetadataPKIXValidationInformationResolver.class);
 
     /** Metadata RoleDescriptor resolver used to resolve metadata information. */
-    private RoleDescriptorResolver roleDescriptorResolver;
-
-    /** Initialization flag. */
-    private boolean isInitialized;
+    @Nonnull private RoleDescriptorResolver roleDescriptorResolver;
 
     /**
      * Constructor.
      * 
      * @param resolver role descriptor resolver
      */
-    public MetadataPKIXValidationInformationResolver(RoleDescriptorResolver resolver) {
+    public MetadataPKIXValidationInformationResolver(@Nonnull final RoleDescriptorResolver resolver) {
         roleDescriptorResolver = Constraint.isNotNull(resolver, "RoleDescriptor resolver cannot be null");
     }
 
-    /** {@inheritDoc} */
-    @Override public boolean isInitialized() {
-        return isInitialized;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void initialize() throws ComponentInitializationException {
-        isInitialized = true;
-    }
-
     /**
      * Get the metadata RoleDescriptor resolver instance used by this resolver.
      * 
      * @return the resolver's RoleDescriptor metadata resolver instance
      */
-    public RoleDescriptorResolver getRoleDescriptorResolver() {
+    @Nonnull public RoleDescriptorResolver getRoleDescriptorResolver() {
         return roleDescriptorResolver;
     }
 
     /** {@inheritDoc} */
     @Override public PKIXValidationInformation resolveSingle(CriteriaSet criteriaSet) throws ResolverException {
-        Iterator<PKIXValidationInformation> pkixInfoIter = resolve(criteriaSet).iterator();
+        final Iterator<PKIXValidationInformation> pkixInfoIter = resolve(criteriaSet).iterator();
         if (pkixInfoIter.hasNext()) {
             return pkixInfoIter.next();
         } else {
@@ -126,13 +112,13 @@
 
         checkCriteriaRequirements(criteriaSet);
 
-        String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();
-
-        EntityRoleCriterion roleCriteria = criteriaSet.get(EntityRoleCriterion.class);
-        QName role = roleCriteria.getRole();
+        final String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();
+
+        final EntityRoleCriterion roleCriteria = criteriaSet.get(EntityRoleCriterion.class);
+        final QName role = roleCriteria.getRole();
 
         String protocol = null;
-        ProtocolCriterion protocolCriteria = criteriaSet.get(ProtocolCriterion.class);

[... 154 lines stripped ...]