[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 12:58:08 2014
New Revision: 5846

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5846&view=rev
Log:
For now, remove component interfaces from Predicate for consistency

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java?rev=5846&r1=5845&r2=5846&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java Mon May  5 12:58:08 2014
@@ -57,11 +57,7 @@
 
         final BeanDefinitionBuilder egPredicate =
                 BeanDefinitionBuilder.genericBeanDefinition(EntitiesDescriptorPredicate.class);
-        // TODO add navigation
-        egPredicate.setInitMethodName("initialize");
-        egPredicate.setDestroyMethodName("destroy");
         egPredicate.addPropertyValue("entitiesDescriptorIds", id);
-        egPredicate.addPropertyValue("id", "EntitiesGroup:" + id);
 
         BeanDefinitionBuilder orPredicate = BeanDefinitionBuilder.genericBeanDefinition(Predicates.class);
         orPredicate.setFactoryMethod("or");
@@ -70,4 +66,5 @@
 
         builder.addPropertyValue("activationCondition", orPredicate.getBeanDefinition());
     }
-}
+    
+}

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java?rev=5846&r1=5845&r2=5846&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java Mon May  5 12:58:08 2014
@@ -25,8 +25,6 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -38,8 +36,7 @@
 /**
  * Predicate to determine whether the supplied ids are in the EntitiesDescriptor or any of its parents.
  */
-public class EntitiesDescriptorPredicate extends AbstractIdentifiableInitializableComponent implements
-        Predicate<ProfileRequestContext> {
+public class EntitiesDescriptorPredicate implements Predicate<ProfileRequestContext> {
 
     /** Relying parties to match against. */
     @Nonnull @NonnullElements private Set<String> entitiesDescriptorIds;
@@ -50,7 +47,6 @@
      * @param ids relying party IDs to match against
      */
     public synchronized void setEntitiesDescriptorIds(@Nonnull @NonnullElements final Collection<String> ids) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(ids, "Relying party ID collection cannot be null");
         
         Set<String> newIds = new HashSet<>(ids.size());
@@ -71,4 +67,4 @@
         return false;
     }
 
-}
+}