[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/Abstract...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Nov 16 13:43:48 2015
New Revision: 7999

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

Modified:
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java?rev=7999&r1=7998&r2=7999&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java	(original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java	Mon Nov 16 13:43:48 2015
@@ -107,6 +107,7 @@
         Assert.assertFalse(config.includeConditionsNotBefore());
     }
     
+    @SuppressWarnings("deprecation")
     @Test public void testAdditionalAudiencesForAssertion() {
         MockSAMLProfileConfiguration config = new MockSAMLProfileConfiguration();
         Assert.assertNotNull(config.getAdditionalAudiencesForAssertion());

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java?rev=7999&r1=7998&r2=7999&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java	(original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java	Mon Nov 16 13:43:48 2015
@@ -84,7 +84,7 @@
      *
      * @param key Session key.
      */
-    public void setSessionKey(final @Nullable String key) {
+    public void setSessionKey(@Nullable final String key) {
         this.sessionKey = key;
     }
 

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=7999&r1=7998&r2=7999&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	Mon Nov 16 13:43:48 2015
@@ -200,22 +200,22 @@
      * Get an {@link SPSession} by reference.
      * 
      * @param requestContext Spring request context
-     * @param sessionKey key identifying the SP session
+     * @param key session 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 {
+            @Nonnull final RequestContext requestContext, @Nonnull final String key) throws MessageException {
         final LogoutContext logoutCtx = requestContext.getExternalContext().getSessionMap().get(
                 SaveLogoutContext.LOGOUT_CONTEXT_KEY, LogoutContext.class);
         if (logoutCtx == null) {
             throw new MessageException("LogoutContext not found in HTTP session.");
         }
         
-        final SPSession s = logoutCtx.getKeyedSessionMap().get(sessionKey);
+        final SPSession s = logoutCtx.getKeyedSessionMap().get(key);
         if (s == null) {
-            throw new MessageException("Session not found for key: " + sessionKey);
+            throw new MessageException("Session not found for key: " + key);
         }
         
         return s;