[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/Abstract...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec 15 18:23:44 2013
New Revision: 5033

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5033&view=rev
Log:
Rename/refactor SAML profile config base class

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
      - copied, changed from r5029, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLProfileConfiguration.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml1/AbstractSAML1ProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/AbstractSAML2ProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/package-info.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfigurationTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAudienceRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotOnOrAfterConditionToAssertions.java

Copied: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java (from r5029, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfiguration.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java?p2=trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java&p1=trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfiguration.java&r1=5029&r2=5033&rev=5033&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSamlProfileConfiguration.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java Sun Dec 15 18:23:44 2013
@@ -22,148 +22,135 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
+import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
+import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableSet;
 
 /** Base class for SAML profile configurations. */
-public abstract class AbstractSamlProfileConfiguration extends AbstractProfileConfiguration {
+public abstract class AbstractSAMLProfileConfiguration
+        extends AbstractProfileConfiguration implements SAMLProfileConfiguration {
 
-    /** Criteria used to determine if the received assertion should be signed. Default criteria always returns false. */
-    private Predicate<ProfileRequestContext> signedRequestsCriteria;
+    /** Predicate used to determine if the received request should be signed. Default returns false. */
+    @Nonnull private Predicate<ProfileRequestContext> signedRequestsPredicate;
 
-    /** Criteria used to determine if the generated response should be signed. Default criteria always returns true. */
-    private Predicate<ProfileRequestContext> signResponsesCriteria;
+    /** Predicate used to determine if the generated response should be signed. Default returns true. */
+    @Nonnull private Predicate<ProfileRequestContext> signResponsesPredicate;
 
-    /**
-     * Criteria used to determine if the generated assertion should be signed. Default criteria always returns false.
-     */
-    private Predicate<ProfileRequestContext> signAssertionsCriteria;
+    /** Predicate used to determine if the generated assertion should be signed. Default returns false. */
+    @Nonnull private Predicate<ProfileRequestContext> signAssertionsPredicate;
 
     /** Lifetime of an assertion in milliseconds. Default value: 5 minutes */
-    private long assertionLifetime;

[... 438 lines stripped ...]