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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 27 15:45:55 2015
New Revision: 7887

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

Modified:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SelectLogoutPropagationFlow.java

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java?rev=7887&r1=7886&r2=7887&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java	(original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java	Tue Oct 27 15:45:55 2015
@@ -190,6 +190,15 @@
         logoutPropCtx.setSession(session);
     }
 
+    /**
+     * Get an {@link SPSession} by reference.
+     * 
+     * @param requestContext Spring request context
+     * @param sessionKey key identifying the SP session
+     * 
+     * @return the SP session
+     * @throws MessageException if an error occurs
+     */
     @Nonnull private SPSession getSessionByReference(
             @Nonnull final RequestContext requestContext, @Nonnull final String sessionKey) throws MessageException {
         final LogoutContext logoutCtx = requestContext.getExternalContext().getSessionMap().get(
@@ -205,6 +214,14 @@
         throw new MessageException("Session not found for key: " + sessionKey);
     }
 
+    /**
+     * Get an {@link SPSession} by value.
+     * 
+     * @param sessionVal serialized SP session
+     * 
+     * @return the SP session
+     * @throws MessageDecodingException if an error occurs
+     */
     @Nonnull private SPSession getSessionByValue(@Nonnull final String sessionVal) throws MessageDecodingException {
         try {
             final String decrypted = dataSealer.unwrap(sessionVal);

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java?rev=7887&r1=7886&r2=7887&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java	(original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java	Tue Oct 27 15:45:55 2015
@@ -1,9 +1,9 @@
 /*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * Licensed to the University Corporation for Advanced Internet Development, 
+ * Inc. (UCAID) under one or more contributor license agreements.  See the 
  * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID licenses this file to You under the Apache 
+ * License, Version 2.0 (the "License"); you may not use this file except in 
  * compliance with the License.  You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
@@ -21,6 +21,9 @@
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.ActionSupport;
 import net.shibboleth.idp.session.context.LogoutContext;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -39,19 +42,31 @@
 public class SaveLogoutContext extends AbstractProfileAction {
 
     /** Key name under which LogoutContext is stored in Session. */
-    public static final String LOGOUT_CONTEXT_KEY = "LogoutContext";
+    @Nonnull @NotEmpty public static final String LOGOUT_CONTEXT_KEY = "net.shibboleth.idp.session.impl.LogoutContext";
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(SaveLogoutContext.class);
 
     /** Looks up a LogoutContext from PRC. */
-    private final Function<ProfileRequestContext, LogoutContext> logoutContextLookup =
-            new ChildContextLookup<>(LogoutContext.class);
-
-    @Nonnull
+    @Nonnull private Function<ProfileRequestContext, LogoutContext> logoutContextLookup;
+            
+    /** Constructor. */
+    public SaveLogoutContext() {

[... 65 lines stripped ...]