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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 21 09:01:24 2014
New Revision: 5751

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5751&view=rev
Log:
IDP-391 service to parse relying-party.x,ml and return the RelyingPartConfiguration

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadableRelyingPartyConfigurationResolver.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/services.xml
Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml

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=5751&r1=5750&r2=5751&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 Mon Apr 21 09:01:24 2014
@@ -28,13 +28,14 @@
 import net.shibboleth.idp.profile.logic.AnonymousProfilePredicate;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.idp.service.AbstractServiceableComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-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.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -56,8 +57,8 @@
  * Note that this resolver does not permit more than one {@link RelyingPartyConfiguration} with the same ID.
  * </p>
  */
-public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiableInitializableComponent implements
-        RelyingPartyConfigurationResolver {
+public class DefaultRelyingPartyConfigurationResolver extends
+        AbstractServiceableComponent<RelyingPartyConfigurationResolver> implements RelyingPartyConfigurationResolver, IdentifiableComponent {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(DefaultRelyingPartyConfigurationResolver.class);
@@ -185,8 +186,8 @@
 
         log.debug("Resolving relying party configurations");
         if (isAnonymousPredicate.apply(context) && null != getAnonymousConfiguration()) {
-            log.debug("Profile Request is anonymous: returning configuration {} only",
-                    getAnonymousConfiguration().getId());
+            log.debug("Profile Request is anonymous: returning configuration {} only", getAnonymousConfiguration()
+                    .getId());
             return Collections.singleton(getAnonymousConfiguration());
         }
 
@@ -219,8 +220,8 @@
             return null;
         }
         if (isAnonymousPredicate.apply(context) && null != getAnonymousConfiguration()) {
-            log.debug("Profile Request is anonymous: returning configuration {} only",
-                    getAnonymousConfiguration().getId());
+            log.debug("Profile Request is anonymous: returning configuration {} only", getAnonymousConfiguration()
+                    .getId());
             return getAnonymousConfiguration();
         }
 
@@ -240,4 +241,17 @@
         return getDefaultConfiguration();
     }
     
+    /** {@inheritDoc} 
+     * This service is identifiable. */
+    @Override
+    public void setId(@Nonnull String componentId) {
+        // TODO Auto-generated method stub
+        super.setId(componentId);
+    }
+
+    /** {@inheritDoc} */

[... 234 lines stripped ...]