[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/security/MetadataCredentialResol...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 20 16:57:17 2013
New Revision: 3449

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3449&view=rev
Log:
Switch MetadataCredentialResolver construction to take a RoleDescriptorResolver rather than MetadataResolver.
It only uses the former anyway, and this better aligns with the other metadata-based resolver impl (MetadataPKIXValidationInformationResovler in the IdP), which can't internally construct the BasicRoleDescriptorResolver impl
from opensaml-saml-impl.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java?rev=3449&r1=3448&r2=3449&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java Fri Sep 20 16:57:17 2013
@@ -37,9 +37,7 @@
 import org.opensaml.saml.criterion.EntityIdCriterion;
 import org.opensaml.saml.criterion.EntityRoleCriterion;
 import org.opensaml.saml.criterion.ProtocolCriterion;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.RoleDescriptorResolver;
-import org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver;
 import org.opensaml.saml.saml2.metadata.KeyDescriptor;
 import org.opensaml.saml.saml2.metadata.RoleDescriptor;
 import org.opensaml.security.credential.Credential;
@@ -73,9 +71,6 @@
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(MetadataCredentialResolver.class);
-
-    /** Metadata EntityDescriptor resolver which is the source of credentials. */
-    private MetadataResolver entityDescriptorResolver;
     
     /** Metadata RoleDescriptor resolver which is the source of credentials. */
     private RoleDescriptorResolver roleDescriptorResolver;
@@ -89,11 +84,11 @@
     /**
      * Constructor.
      * 
-     * @param resolver resolver of metadata EntityDescriptors
-     */
-    public MetadataCredentialResolver(@Nonnull final MetadataResolver resolver) {
+     * @param resolver resolver of metadata RoleDescriptors
+     */
+    public MetadataCredentialResolver(@Nonnull final RoleDescriptorResolver resolver) {
         super();
-        entityDescriptorResolver = Constraint.isNotNull(resolver, "Metadata resolver cannot be null");
+        roleDescriptorResolver = Constraint.isNotNull(resolver, "RoleDescriptor resolver cannot be null");
         
     }
 
@@ -104,24 +99,12 @@
 
     /** {@inheritDoc} */
     public void initialize() throws ComponentInitializationException {
-        roleDescriptorResolver = new BasicRoleDescriptorResolver(entityDescriptorResolver);
-        roleDescriptorResolver.initialize();
-        
         if (keyInfoCredentialResolver == null) {
             keyInfoCredentialResolver = SecurityConfigurationSupport.getGlobalXMLSecurityConfiguration()
                     .getDefaultKeyInfoCredentialResolver();
         }
         
         isInitialized = true;
-    }
-
-    /**
-     * Get the metadata EntityDescriptor resolver instance used by this resolver.
-     *
-     * @return the resolver's EntityDescriptor metadata resolver instance
-     */
-    public MetadataResolver getMetadataResolver() {
-        return entityDescriptorResolver;
     }
     
     /**

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java?rev=3449&r1=3448&r2=3449&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java Fri Sep 20 16:57:17 2013
@@ -18,11 +18,11 @@
 package org.opensaml.saml.security;
 
 import org.opensaml.core.xml.util.AbstractWrappedSingletonFactory;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.metadata.resolver.RoleDescriptorResolver;
 
 /**
  * Singleton factory for producing instances of {@link MetadataCredentialResolver}
- * based on a given instance of {@link MetadataResolver}.  
+ * based on a given instance of {@link RoleDescriptorResolver}.  
  * 
  * <p>
  * Only once instance of a metadata credential resolver will exist for 
@@ -30,7 +30,7 @@

[... 168 lines stripped ...]