[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl: AbstractM...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Mar 20 08:33:32 2014
New Revision: 3716

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3716&view=rev
Log:
IDP-277  Make the MetadataResolvers Identifiable so Spring can set their IDs

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java?rev=3716&r1=3715&r2=3716&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java Thu Mar 20 08:33:32 2014
@@ -30,7 +30,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -58,12 +58,12 @@
 import com.google.common.base.Strings;
 
 /** An abstract, base, implementation of a metadata provider. */
-public abstract class AbstractMetadataResolver extends AbstractIdentifiedInitializableComponent 
-        implements MetadataResolver {
-    
+public abstract class AbstractMetadataResolver extends AbstractIdentifiableInitializableComponent implements
+        MetadataResolver {
+
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AbstractMetadataResolver.class);
-    
+
     /** Unmarshaller factory used to get an unmarshaller for the metadata DOM. */
     private UnmarshallerFactory unmarshallerFactory;
 
@@ -78,7 +78,7 @@
      * assumption being that in most cases a provider will recover at some point in the future. Default: true.
      */
     private boolean failFastInitialization;
-    
+
     /** Backing store for runtime EntityDescriptor data. */
     private EntityBackingStore entityBackingStore;
 
@@ -91,30 +91,26 @@
         unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
         setId(UUID.randomUUID().toString());
     }
-    
-    /** {@inheritDoc} */
-    @Override
-    public boolean isRequireValidMetadata() {
+
+    /** {@inheritDoc} */
+    @Override public boolean isRequireValidMetadata() {
         return requireValidMetadata;
     }
 
     /** {@inheritDoc} */
-    @Override
-    public void setRequireValidMetadata(boolean require) {
+    @Override public void setRequireValidMetadata(boolean require) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         requireValidMetadata = require;
     }
 
     /** {@inheritDoc} */
-    @Override
-    @Nullable  public MetadataFilter getMetadataFilter() {
+    @Override @Nullable public MetadataFilter getMetadataFilter() {
         return mdFilter;
     }
 
     /** {@inheritDoc} */
-    @Override
-    public void setMetadataFilter(@Nullable MetadataFilter newFilter) {
+    @Override public void setMetadataFilter(@Nullable MetadataFilter newFilter) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         mdFilter = newFilter;
@@ -161,12 +157,11 @@
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         parser = Constraint.isNotNull(pool, "ParserPool may not be null");
     }
-    
-    /** {@inheritDoc} */
-    @Override
-    @Nullable public EntityDescriptor resolveSingle(CriteriaSet criteria) throws ResolverException {
+
+    /** {@inheritDoc} */
+    @Override @Nullable public EntityDescriptor resolveSingle(CriteriaSet criteria) throws ResolverException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
-        
+
         Iterable<EntityDescriptor> iterable = resolve(criteria);
         if (iterable != null) {
             Iterator<EntityDescriptor> iterator = iterable.iterator();
@@ -176,9 +171,9 @@
         }
         return null;
     }
-    
-    /**
-     * Get the XMLObject unmarshaller factory to use. 
+
+    /**
+     * Get the XMLObject unmarshaller factory to use.
      * 
      * @return the unmarshaller factory instance to use
      */
@@ -187,10 +182,9 @@
     }
 
     /** {@inheritDoc} */
-    @Override

[... 254 lines stripped ...]