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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 17 22:25:11 2013
New Revision: 5051

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5051&view=rev
Log:
Rename remaining config class.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfiguration.java
      - copied, changed from r5048, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfigurationTest.java
      - copied, changed from r5048, trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfigurationTest.java
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/package-info.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfigurationTest.java

Copied: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfiguration.java (from r5048, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfiguration.java?p2=trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfiguration.java&p1=trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java&r1=5048&r2=5051&rev=5051&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SSOSProfileConfiguration.java Tue Dec 17 22:25:11 2013
@@ -20,6 +20,8 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.saml.profile.config.saml2.BrowserSSOProfileConfiguration;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -29,22 +31,21 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
-/** SAMLConfigurationSupport for constrained Liberty IDWSF SSOS requests. */
-public class SsosProfileConfiguration extends BrowserSSOProfileConfiguration {
+/** Configuration support for the Liberty ID-WSF SSOS profile. */
+public class SSOSProfileConfiguration extends BrowserSSOProfileConfiguration {
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/liberty/ssos";
+    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/liberty/ssos";
 
     /** Maximum number of times a given token is allowed to have been delegated. Default value: 0 */
-    private int maximumTokenDelegationChainLength;
+    @NonNegative private long maximumTokenDelegationChainLength;
 
-    /** Criterion used to determine if a token may be delegated to a relying party. */
-    private Predicate<ProfileRequestContext<RequestAbstractType, Response>> delegationCriterion;
+    /** Predicate used to determine if a token may be delegated to a relying party. */
+    @Nonnull private Predicate<ProfileRequestContext<RequestAbstractType, Response>> delegationPredicate;
 
     /** Constructor. */
-    public SsosProfileConfiguration() {
+    public SSOSProfileConfiguration() {
         this(PROFILE_ID);
-        delegationCriterion = Predicates.alwaysFalse();
     }
 
     /**
@@ -52,9 +53,11 @@
      * 
      * @param profileId unique ID for this profile
      */
-    protected SsosProfileConfiguration(final String profileId) {
+    protected SSOSProfileConfiguration(final String profileId) {
         super(profileId);
+        
         maximumTokenDelegationChainLength = 0;
+        delegationPredicate = Predicates.alwaysFalse();
     }
 
     /**
@@ -62,7 +65,7 @@
      * 
      * @return maximum number of times a given token is allowed to have been delegated
      */
-    public int getMaximumTokenDelegationChainLength() {
+    public long getMaximumTokenDelegationChainLength() {
         return maximumTokenDelegationChainLength;
     }
 
@@ -71,26 +74,28 @@
      * 
      * @param length maximum number of times a given token is allowed to have been delegated
      */
-    public void setMaximumTokenDelegationChainLength(final int length) {
-        maximumTokenDelegationChainLength = length;
+    public void setMaximumTokenDelegationChainLength(final long length) {
+        maximumTokenDelegationChainLength = Constraint.isGreaterThanOrEqual(0, length,

[... 84 lines stripped ...]