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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 30 23:03:18 2013
New Revision: 5113

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5113&view=rev
Log:
Annotations and cleanup.

Modified:
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BasicSPSession.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionException.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/SessionContext.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/criterion/SPSessionCriterion.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/criterion/SessionIdCriterion.java

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java?rev=5113&r1=5112&r2=5113&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java (original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java Mon Dec 30 23:03:18 2013
@@ -120,21 +120,25 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NotEmpty public String getId() {
         return id;
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NotEmpty public String getPrincipalName() {
         return principalName;
     }
 
     /** {@inheritDoc} */
+    @Override
     public long getCreationInstant() {
         return creationInstant;
     }
 
     /** {@inheritDoc} */
+    @Override
     public long getLastActivityInstant() {
         return lastActivityInstant;
     }
@@ -214,23 +218,27 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NonnullElements @NotLive @Unmodifiable public Set<AuthenticationResult> getAuthenticationResults() {
         return ImmutableSet.copyOf(Optional.presentInstances(authenticationResults.values()));
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public AuthenticationResult getAuthenticationResult(@Nonnull @NotEmpty final String flowId) {
         Optional<AuthenticationResult> mapped = authenticationResults.get(StringSupport.trimOrNull(flowId));
         return (mapped != null) ? mapped.orNull() : null;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public AuthenticationResult addAuthenticationResult(@Nonnull final AuthenticationResult result)
             throws SessionException {
         return doAddAuthenticationResult(result);
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean removeAuthenticationResult(@Nonnull final AuthenticationResult result) throws SessionException {
         return doRemoveAuthenticationResult(result);
     }
@@ -283,23 +291,27 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NonnullElements @NotLive @Unmodifiable public Set<SPSession> getSPSessions() {
         return ImmutableSet.copyOf(Optional.presentInstances(spSessions.values()));
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public SPSession getSPSession(@Nonnull @NotEmpty final String serviceId) {
         Optional<SPSession> mapped = spSessions.get(StringSupport.trimOrNull(serviceId));
         return (mapped != null) ? mapped.orNull() : null;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public SPSession addSPSession(@Nonnull final SPSession spSession)
             throws SessionException {
         return doAddSPSession(spSession);
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean removeSPSession(@Nonnull final SPSession spSession) throws SessionException {
         return doRemoveSPSession(spSession);
     }
@@ -348,6 +360,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean checkAddress(@Nonnull @NotEmpty final String address) throws SessionException {
         AddressFamily family = getAddressFamily(address);
         if (family == AddressFamily.UNKNOWN) {
@@ -374,12 +387,14 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     public boolean checkTimeout() throws SessionException {
         setLastActivityInstant(System.currentTimeMillis());
         return true;
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean equals(Object obj) {
         if (obj == null) {
             return false;
@@ -397,11 +412,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public int hashCode() {
         return id.hashCode();
     }
 
     /** {@inheritDoc} */
+    @Override
     public String toString() {
         return Objects.toStringHelper(this).add("sessionId", id).add("principalName", principalName)
                 .add("IPv4", ipV4Address).add("IPv6", ipV6Address)


[... 167 lines stripped ...]