[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRel...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar 12 11:29:44 2014
New Revision: 5559

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5559&view=rev
Log:
IDP-277 Make DefaultRelyingPartyConfiResolver take a list of ResoverConfigurations since we require that this be ordered so make defaults work.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java?rev=5559&r1=5558&r2=5559&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java Wed Mar 12 11:29:44 2014
@@ -18,9 +18,9 @@
 package net.shibboleth.idp.relyingparty.impl;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -60,7 +60,7 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(DefaultRelyingPartyConfigurationResolver.class);
 
     /** Registered relying party configurations. */
-    private Collection<RelyingPartyConfiguration> rpConfigurations;
+    private List<RelyingPartyConfiguration> rpConfigurations;
 
     /** Constructor. */
     public DefaultRelyingPartyConfigurationResolver() {
@@ -72,7 +72,7 @@
      * 
      * @return unmodifiable list of registered relying party configurations
      */
-    @Nonnull @NonnullElements @Unmodifiable @NotLive public Collection<RelyingPartyConfiguration>
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public List<RelyingPartyConfiguration>
             getRelyingPartyConfigurations() {
         return ImmutableList.copyOf(rpConfigurations);
     }
@@ -85,7 +85,7 @@
      * @param configs list of registered relying party configurations
      */
     public void setRelyingPartyConfigurations(
-            @Nonnull @NonnullElements final Collection<RelyingPartyConfiguration> configs) {
+            @Nonnull @NonnullElements final List<RelyingPartyConfiguration> configs) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(configs, "RelyingPartyConfiguration collection cannot be null");