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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 10 13:33:01 2013
New Revision: 4761

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4761&view=rev
Log:
Serializer for authentication results.

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java   (with props)
    trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java   (with props)
    trunk/idp-authn-api/src/test/resources/data/
    trunk/idp-authn-api/src/test/resources/data/net/
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/complexAuthenticationResult.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/invalid.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noActivity.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noFlowId.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noInstant.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/simpleAuthenticationResult.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/symbolicAuthenticationResult.json
Modified:
    trunk/idp-authn-api/pom.xml
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java

Modified: trunk/idp-authn-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/pom.xml?rev=4761&r1=4760&r2=4761&view=diff
==============================================================================
--- trunk/idp-authn-api/pom.xml (original)
+++ trunk/idp-authn-api/pom.xml Tue Sep 10 13:33:01 2013
@@ -31,10 +31,18 @@
             <groupId>org.springframework.webflow</groupId>
             <artifactId>spring-webflow</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.json</groupId>
+            <artifactId>javax.json-api</artifactId>
+        </dependency>
 
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+        </dependency>
 
         <!-- Test Dependencies -->
         

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=4761&r1=4760&r2=4761&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Tue Sep 10 13:33:01 2013
@@ -141,7 +141,7 @@
      * 
      * @param flowLifetime the lifetime for the flow, must be 0 or greater
      */
-    public void setLifetime(@Duration long flowLifetime) {
+    public void setLifetime(@Duration final long flowLifetime) {
         lifetime = Constraint.isGreaterThanOrEqual(0, flowLifetime, "Lifetime must be greater than or equal to 0");
     }
 
@@ -161,7 +161,7 @@
      * 
      * @param timeout the flow inactivity timeout, must be 0 or greater
      */
-    public void setInactivityTimeout(@Duration long timeout) {
+    public void setInactivityTimeout(@Duration final long timeout) {
         inactivityTimeout = Constraint.isGreaterThanOrEqual(0, timeout,
                 "Inactivity timeout must be greater than or equal to 0");
     }
@@ -189,7 +189,8 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull @NonnullElements @Unmodifiable public <T extends Principal> Set<T> getSupportedPrincipals(Class<T> c) {
+    @Nonnull @NonnullElements @Unmodifiable public <T extends Principal> Set<T> getSupportedPrincipals(
+            @Nonnull final Class<T> c) {
         return supportedPrincipals.getPrincipals(c);
     }
 

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=4761&r1=4760&r2=4761&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 Tue Sep 10 13:33:01 2013
@@ -47,12 +47,12 @@
 
     /** The Subject established by the authentication result. */
     @Nonnull private final Subject subject;
-    
+
     /** The identifier of the flow used to produce this result. */

[... 43 lines stripped ...]