[java-identity-provider COMMIT] /trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedId...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul  2 09:57:14 2014
New Revision: 6207

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6207&view=rev
Log:
checkstyle

Modified:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java?rev=6207&r1=6206&r2=6207&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java Wed Jul  2 09:57:14 2014
@@ -49,40 +49,39 @@
 
 /**
  * A serializer for instances of {@link StorageBackedIdPSession} designed in conjunction with the
- * {@link org.opensaml.storage.StorageService}-backed {@link net.shibboleth.idp.session.SessionManager}
- * implementation.
+ * {@link org.opensaml.storage.StorageService}-backed {@link net.shibboleth.idp.session.SessionManager} implementation.
  */
 @ThreadSafe
-public class StorageBackedIdPSessionSerializer extends AbstractInitializableComponent
-        implements StorageSerializer<StorageBackedIdPSession> {
+public class StorageBackedIdPSessionSerializer extends AbstractInitializableComponent implements
+        StorageSerializer<StorageBackedIdPSession> {
 
     /** Field name of creation instant. */
     @Nonnull @NotEmpty private static final String CREATION_INSTANT_FIELD = "ts";
 
     /** Field name of principal name. */
     @Nonnull @NotEmpty private static final String PRINCIPAL_NAME_FIELD = "nam";
-    
+
     /** Field name of IPv4 address. */
     @Nonnull @NotEmpty private static final String IPV4_ADDRESS_FIELD = "v4";
 
     /** Field name of IPv6 address. */
     @Nonnull @NotEmpty private static final String IPV6_ADDRESS_FIELD = "v6";
-    
+
     /** Field name of flow ID array. */
     @Nonnull @NotEmpty private static final String FLOW_ID_ARRAY_FIELD = "flows";
 
     /** Field name of service ID array. */
     @Nonnull @NotEmpty private static final String SERVICE_ID_ARRAY_FIELD = "svcs";
-    
+
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(StorageBackedIdPSessionSerializer.class);
-    
+
     /** Back-reference to parent instance. */
     @Nonnull private final StorageBackedSessionManager sessionManager;
-    
+
     /** Object instance to overwrite with deserialization method. */
     @Nullable private final StorageBackedIdPSession targetObject;
-    
+
     /**
      * Constructor.
      * 
@@ -94,18 +93,17 @@
         sessionManager = Constraint.isNotNull(manager, "SessionManager cannot be null");
         targetObject = target;
     }
-    
+
     /** {@inheritDoc} */
-    @Override
-    @Nonnull @NotEmpty public String serialize(@Nonnull final StorageBackedIdPSession instance) throws IOException {
-        
+    @Override @Nonnull @NotEmpty public String serialize(@Nonnull final StorageBackedIdPSession instance)
+            throws IOException {
+
         try {
             final StringWriter sink = new StringWriter(128);
             final JsonGenerator gen = Json.createGenerator(sink);
-            gen.writeStartObject()
-                .write(CREATION_INSTANT_FIELD, instance.getCreationInstant())
-                .write(PRINCIPAL_NAME_FIELD, instance.getPrincipalName());
-            
+            gen.writeStartObject().write(CREATION_INSTANT_FIELD, instance.getCreationInstant())
+                    .write(PRINCIPAL_NAME_FIELD, instance.getPrincipalName());
+
             if (instance.getAddress(AbstractIdPSession.AddressFamily.IPV4) != null) {
                 gen.write(IPV4_ADDRESS_FIELD, instance.getAddress(AbstractIdPSession.AddressFamily.IPV4));
             }
@@ -113,7 +111,7 @@
             if (instance.getAddress(AbstractIdPSession.AddressFamily.IPV6) != null) {
                 gen.write(IPV6_ADDRESS_FIELD, instance.getAddress(AbstractIdPSession.AddressFamily.IPV6));
             }
-            
+
             Set<AuthenticationResult> results = instance.getAuthenticationResults();
             if (!results.isEmpty()) {
                 gen.writeStartArray(FLOW_ID_ARRAY_FIELD);
@@ -122,7 +120,7 @@
                 }
                 gen.writeEnd();
             }
-            
+
             if (sessionManager.isTrackSPSessions()) {
                 Set<SPSession> services = instance.getSPSessions();
                 if (!services.isEmpty()) {
@@ -133,9 +131,9 @@
                     gen.writeEnd();
                 }
             }
-            
+
             gen.writeEnd().close();
-            
+
             return sink.toString();
         } catch (JsonException e) {
             log.error("Exception while serializing IdPSession", e);
@@ -144,12 +142,11 @@
     }
 

[... 74 lines stripped ...]