[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 22 11:30:17 2013
New Revision: 4605

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4605&view=rev
Log:
Rename workflow methods and add annotations.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
    trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/context/AuthenticationContextTest.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterAvailableWorkflowsByPassivity.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterAvailableWorkflowsByRequestedWorkflows.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationWorkflow.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeAuthenticationContextTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java?rev=4605&r1=4604&r2=4605&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java Mon Jul 22 11:30:17 2013
@@ -29,6 +29,7 @@
 
 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.Positive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -53,10 +54,10 @@
     @Nonnull @NotEmpty private final String authenticationFlowId;
 
     /** The time, in milliseconds since the epoch, that the authentication completed. */
-    private final long authenticationInstant;
+    @Positive private final long authenticationInstant;
 
     /** The last time, in milliseconds since the epoch, this result was used to bypass authentication. */
-    private long lastActivityInstant;
+    @Positive private long lastActivityInstant;
     
     /**
      * Constructor. <p>Sets the authentication instant to the current time.</p>
@@ -117,33 +118,27 @@
     /**
      * Get the time, in milliseconds since the epoch, that the authentication completed.
      * 
-     * <p>Always greater or equal to 0.</p>
-     * 
      * @return time, in milliseconds since the epoch, that the authentication completed, never less than 0
      */
-    public long getAuthenticationInstant() {
+    @Positive public long getAuthenticationInstant() {
         return authenticationInstant;
     }
     
     /**
-     * Get the last time, in milliseconds since the epoch, this result was used to bypass authentication.
+     * Get the last time, in milliseconds since the epoch, this result was used for authentication.
      * 
-     * <p>Always greater or equal to 0.</p>
-     * 
-     * @return last time, in milliseconds since the epoch, this result was used to bypass authentication
+     * @return last time, in milliseconds since the epoch, this result was used for authentication
      */
-    public long getLastActivityInstant() {
+    @Positive public long getLastActivityInstant() {
         return lastActivityInstant;
     }
     
     /**
-     * Set the last time, in milliseconds since the epoch, result was used to bypass authentication.
-     * 
-     * <p>Must be greater than 0.</p>
+     * Set the last time, in milliseconds since the epoch, result was used for authentication.
      * 
      * @param instant last time, in milliseconds since the epoch, result was used to bypass authentication
      */
-    public void setLastActivityInstant(final long instant) {
+    public void setLastActivityInstant(@Positive final long instant) {
         lastActivityInstant = Constraint.isGreaterThan(0, instant, "Last activity instant must be greater than 0");
     }
 

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java?rev=4605&r1=4604&r2=4605&view=diff

[... 617 lines stripped ...]