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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec  3 13:26:25 2013
New Revision: 4978

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4978&view=rev
Log:
Further relying party API cleanup.

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfiguration.java
      - copied, changed from r4974, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolver.java
      - copied, changed from r4974, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolver.java
Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/SelectProfileConfiguration.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java?rev=4978&r1=4977&r2=4978&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java Tue Dec  3 13:26:25 2013
@@ -49,7 +49,7 @@
     }
 
     /** {@inheritDoc} */
-    @Nullable public String getId() {
+    @Nonnull @NotEmpty public String getId() {
         return id;
     }
 

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java?rev=4978&r1=4977&r2=4978&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java Tue Dec  3 13:26:25 2013
@@ -19,6 +19,11 @@
 
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 import net.shibboleth.utilities.java.support.security.RandomIdentifierGenerationStrategy;
@@ -28,30 +33,32 @@
 import org.opensaml.xmlsec.SignatureSigningConfiguration;
 import org.opensaml.xmlsec.SignatureValidationConfiguration;
 
-/** Configuration for request/response security operations. */
+/** Configuration for security behavior of profiles. */
 public class SecurityConfiguration {
 
     /** Acceptable clock skew expressed in milliseconds. */
-    private final long clockSkew;
+    @Duration @Positive private final long clockSkew;
 
     /** Generator used to generate various secure IDs (e.g., message identifiers). */
-    private final IdentifierGenerationStrategy idGenerator;
+    @Nonnull private final IdentifierGenerationStrategy idGenerator;
 
     /** Configuration used when validating protocol message signatures. */
-    private SignatureValidationConfiguration sigValidateConfig;
+    @Nullable private SignatureValidationConfiguration sigValidateConfig;
 
     /** Configuration used when generating protocol message signatures. */
-    private SignatureSigningConfiguration sigSigningConfig;
+    @Nullable private SignatureSigningConfiguration sigSigningConfig;
 
     /** Configuration used when decrypting protocol message information. */
-    private DecryptionConfiguration decryptConfig;

[... 727 lines stripped ...]