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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 15 22:16:31 2015
New Revision: 7754

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

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/package-info.java   (with props)
Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java?rev=7754&r1=7753&r2=7754&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExternalAuthenticationImpl.java	Tue Sep 15 22:16:31 2015
@@ -40,7 +40,6 @@
 import net.shibboleth.idp.authn.context.ExternalAuthenticationContext;
 import net.shibboleth.idp.consent.context.ConsentManagementContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java?rev=7754&r1=7753&r2=7754&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java	Tue Sep 15 22:16:31 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
@@ -24,6 +24,8 @@
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
 import org.springframework.webflow.execution.RequestContext;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.servlet.ServletRequest;
 
 /**
@@ -62,7 +64,14 @@
         }
     }
 
-    private ProfileRequestContext getProfileRequestContext(final RequestContext context) {
+    /**
+     * Get the profile request context bound to conversation scope.
+     * 
+     * @param context Spring request context
+     * 
+     * @return the bound profile request context, or null
+     */
+    @Nullable private ProfileRequestContext getProfileRequestContext(@Nonnull final RequestContext context) {
         final Object prc = context.getConversationScope().get(ProfileRequestContext.BINDING_KEY);
         if (prc instanceof ProfileRequestContext) {
             return (ProfileRequestContext) prc;
@@ -70,11 +79,19 @@
         return null;
     }
 
-    private ServletRequest getRequest(final RequestContext context) {
+    /**
+     * Get the servlet request.
+     * 
+     * @param context Spring request context
+     * 
+     * @return servlet request, or null
+     */
+    @Nullable private ServletRequest getRequest(@Nonnull final RequestContext context) {
         final Object o = context.getExternalContext().getNativeRequest();
         if (o instanceof ServletRequest) {
             return (ServletRequest) o;
         }
         return null;
     }
-}
+
+}