[java-identity-provider COMMIT] in /trunk: idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.ja...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  7 12:30:13 2013
New Revision: 4834

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4834&view=rev
Log:
Annotation cleanup.

Modified:
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java?rev=4834&r1=4833&r2=4834&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java (original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java Mon Oct  7 12:30:13 2013
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -43,10 +44,10 @@
     @Nonnull @NotEmpty private final String authenticationFlowId;
     
     /** The time, in milliseconds since the epoch, when this session was created. */
-    @Positive private final long creationInstant;
+    @Duration @Positive private final long creationInstant;
 
     /** The time, in milliseconds since the epoch, when this session expires. */
-    @Positive private final long expirationInstant;
+    @Duration @Positive private final long expirationInstant;
     
     /**
      * Constructor.
@@ -57,7 +58,7 @@
      * @param expiration expiration time of session, in milliseconds since the epoch
      */
     public BasicSPSession(@Nonnull @NotEmpty final String id, @Nonnull @NotEmpty final String flowId,
-            @Positive final long creation, @Positive final long expiration) {
+            @Duration @Positive final long creation, @Duration @Positive final long expiration) {
         serviceId = Constraint.isNotNull(StringSupport.trimOrNull(id), "Service ID cannot be null nor empty");
         authenticationFlowId = Constraint.isNotNull(
                 StringSupport.trimOrNull(flowId), "Authentication flow ID cannot be null or empty");

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java?rev=4834&r1=4833&r2=4834&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java Mon Oct  7 12:30:13 2013
@@ -29,6 +29,7 @@
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 
 /**
  * A serializer for {@link BasicSPSession} objects.
@@ -48,7 +49,7 @@
     /** {@inheritDoc} */
     @Nonnull protected SPSession doDeserialize(@Nonnull final JsonObject obj,
             @Nonnull @NotEmpty final String id, @Nonnull @NotEmpty final String flowId,
-            final long creation, final long expiration) throws IOException {
+            @Duration @Positive final long creation, @Duration @Positive final long expiration) throws IOException {
         
         return new BasicSPSession(id, flowId, creation, expiration);
     }