[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver....

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar  6 15:58:32 2013
New Revision: 3250

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3250&view=rev
Log:
OSJ-28: ported java-opensaml2 1591

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.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=3250&r1=3249&r2=3250&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 Wed Mar  6 15:58:32 2013
@@ -28,8 +28,10 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -38,7 +40,6 @@
 import org.opensaml.saml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.saml.saml2.metadata.provider.MetadataProviderException;
 import org.opensaml.saml.saml2.metadata.provider.ObservableMetadataProvider;
-import org.opensaml.security.credential.BasicCredential;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.security.credential.MutableCredential;
 import org.opensaml.security.credential.UsageType;
@@ -89,15 +90,10 @@
      * Constructor.
      * 
      * @param metadataProvider provider of the metadata
-     * 
-     * @throws IllegalArgumentException thrown if the supplied provider is null
-     */
-    public MetadataCredentialResolver(MetadataProvider metadataProvider) {
+     */
+    public MetadataCredentialResolver(@Nonnull final MetadataProvider metadataProvider) {
         super();
-        if (metadataProvider == null) {
-            throw new IllegalArgumentException("Metadata provider may not be null");
-        }
-        metadata = metadataProvider;
+        metadata = Constraint.isNotNull(metadataProvider, "Metadata provider cannot be null");
 
         cache = new HashMap<MetadataCacheKey, SoftReference<Collection<Credential>>>();
 
@@ -113,6 +109,15 @@
 
     }
 
+    /**
+     * Get the metadata provider instance used by this resolver.
+     *
+     * @return the resolver's metadata provider instance
+     */
+    public MetadataProvider getMetadataProvider() {
+        return metadata;
+    }
+    
     /**
      * Get the KeyInfo credential resolver used by this metadata resolver to handle KeyInfo elements.
      *