[java-identity-provider COMMIT] in /trunk: idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetada...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Aug 28 16:19:47 2011
New Revision: 4038

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4038&view=rev
Log:
Remove special MetadataResolver interface in favor of more generic Resolver interface
Move to OpenSAML's SAML metadata resolver interface

Removed:
    trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/MetadataResolver.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/
Modified:
    trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java

Modified: trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java?rev=4038&r1=4037&r2=4038&view=diff
==============================================================================
--- trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java (original)
+++ trunk/idp-metadata-api/src/main/java/net/shibboleth/idp/metadata/CompositeMetadataResolver.java Sun Aug 28 16:19:47 2011
@@ -25,6 +25,7 @@
 import org.opensaml.util.collections.LazyList;
 import org.opensaml.util.component.AbstractIdentifiedInitializableComponent;
 import org.opensaml.util.criteria.CriteriaSet;
+import org.opensaml.util.resolver.Resolver;
 import org.opensaml.util.resolver.ResolverException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,22 +37,23 @@
  * @param <MetadataType> type of metadata returned by the resolver
  */
 public class CompositeMetadataResolver<MetadataType> extends AbstractIdentifiedInitializableComponent implements
-        MetadataResolver<MetadataType> {
+        Resolver<MetadataType, CriteriaSet> {
 
     /** Resolvers composed by this resolver. */
-    private final List<MetadataResolver<MetadataType>> resolvers;
+    private final List<Resolver<MetadataType, CriteriaSet>> resolvers;
 
     /**
      * Constructor.
      * 
      * @param composedResolvers resolvers composed by this resolver, may be null or contain null elements
      */
-    public CompositeMetadataResolver(final List<MetadataResolver<MetadataType>> composedResolvers) {
+    public CompositeMetadataResolver(final List<Resolver<MetadataType, CriteriaSet>> composedResolvers) {
         if (composedResolvers == null || composedResolvers.isEmpty()) {
             resolvers = Collections.emptyList();
         } else {
-            LazyList<MetadataResolver<MetadataType>> checkedResolvers =
-                    CollectionSupport.addNonNull(composedResolvers, new LazyList<MetadataResolver<MetadataType>>());
+            LazyList<Resolver<MetadataType, CriteriaSet>> checkedResolvers =
+                    CollectionSupport
+                            .addNonNull(composedResolvers, new LazyList<Resolver<MetadataType, CriteriaSet>>());
             resolvers = Collections.unmodifiableList(checkedResolvers);
         }
     }
@@ -66,7 +68,7 @@
      * 
      * @return list of resolvers composed by this resolver, never null nor containing null elements
      */
-    public List<MetadataResolver<MetadataType>> getComposedResolvers() {
+    public List<Resolver<MetadataType, CriteriaSet>> getComposedResolvers() {
         return resolvers;
     }
 
@@ -78,7 +80,7 @@
     /** {@inheritDoc} */
     public MetadataType resolveSingle(CriteriaSet criteria) throws ResolverException {
         MetadataType metadata = null;
-        for (MetadataResolver<MetadataType> resolver : resolvers) {
+        for (Resolver<MetadataType, CriteriaSet> resolver : resolvers) {
             metadata = resolver.resolveSingle(criteria);
             if (metadata != null) {
                 return metadata;
@@ -98,7 +100,7 @@
         private final Logger log = LoggerFactory.getLogger(CompositeMetadataResolverIterable.class);
 
         /** Resolvers over which to iterate. */
-        private final List<MetadataResolver<MetadataType>> resolvers;
+        private final List<Resolver<MetadataType, CriteriaSet>> resolvers;
 
         /** Criteria being search for. */
         private final CriteriaSet criteria;
@@ -109,13 +111,14 @@
          * @param composedResolvers resolvers from which results will be pulled
          * @param metadataCritiera criteria for the resolver query
          */
-        public CompositeMetadataResolverIterable(final List<MetadataResolver<MetadataType>> composedResolvers,
+        public CompositeMetadataResolverIterable(final List<Resolver<MetadataType, CriteriaSet>> composedResolvers,
                 final CriteriaSet metadataCritiera) {
             if (composedResolvers == null || composedResolvers.isEmpty()) {
                 resolvers = Collections.emptyList();
             } else {
-                LazyList<MetadataResolver<MetadataType>> checkedResolvers =
-                        CollectionSupport.addNonNull(composedResolvers, new LazyList<MetadataResolver<MetadataType>>());
+                LazyList<Resolver<MetadataType, CriteriaSet>> checkedResolvers =

[... 29 lines stripped ...]