[java-identity-provider] branch main updated: Test warning cleanup.

Scott Cantor cantor.2 at osu.edu
Mon Aug 7 13:15:16 UTC 2023


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=197191c9e16e4598fa38e100d5d12233decfbbd6

The following commit(s) were added to refs/heads/main by this push:
     new 197191c9e Test warning cleanup.
197191c9e is described below

commit 197191c9e16e4598fa38e100d5d12233decfbbd6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 7 09:14:21 2023 -0400

    Test warning cleanup.
---
 .../context/impl/AuthenticationContextTest.java    |   3 +-
 .../DefaultAuthenticationResultSerializerTest.java |   3 +-
 .../idp/authn/impl/ExtractRemoteUserTest.java      |   1 +
 .../authn/impl/ExtractUserAgentAddressTest.java    |   1 +
 .../authn/impl/ExtractUserAgentIdentifierTest.java |   1 +
 .../ExtractUsernamePasswordFromBasicAuthTest.java  |   1 +
 ...ExtractUsernamePasswordFromFormRequestTest.java |   1 +
 .../ExtractX509CertificateFromRequestTest.java     |   7 +-
 .../authn/impl/FilterFlowsByForceAuthnTest.java    |   1 +
 .../impl/FilterFlowsByNonBrowserSupportTest.java   |   1 +
 .../impl/HTPasswdCredentialValidatorTest.java      |   1 +
 .../authn/impl/JAASCredentialValidatorTest.java    |   1 +
 .../impl/KeystoreResourceCredentialConfigTest.java |  13 ++-
 .../authn/impl/LDAPCredentialValidatorTest.java    | 126 +++++++++++----------
 ...PopulateSubjectCanonicalizationContextTest.java |   1 +
 .../impl/PreserveAuthenticationFlowStateTest.java  |   1 +
 .../SelectSubjectCanonicalizationFlowTest.java     |   1 +
 .../impl/SimpleSubjectCanonicalizationTest.java    |   1 +
 .../StorageBackedAccountLockoutManagerTest.java    |  80 ++++++++-----
 .../TransitionMultiFactorAuthenticationTest.java   |   1 +
 .../impl/ValidateExternalAuthenticationTest.java   |   1 +
 .../idp/authn/impl/ValidateFunctionResultTest.java |   1 +
 .../idp/authn/impl/ValidateRemoteUserTest.java     |   1 +
 .../impl/X500SubjectCanonicalizationTest.java      |   1 +
 .../X509CertificateCredentialValidatorTest.java    |   1 +
 .../idp/authn/impl/X509ProxyFilterTest.java        |   7 +-
 .../impl/X509ResourceCredentialConfigTest.java     |   6 +-
 .../ExactPrincipalEvalPredicateFactoryTest.java    |   1 +
 .../InexactPrincipalEvalPredicateFactoryTest.java  |   1 +
 .../impl/X500PrincipalSerializerTest.java          |   1 +
 .../impl/DiscoveryProfileRequestFunctionTest.java  |   1 +
 .../proxy/impl/ExtractDiscoveryResponseTest.java   |   1 +
 .../InitializeProxyProfileRequestContextTest.java  |   1 +
 .../impl/RevocationCacheConditionTest.java         |   9 +-
 .../spnego/impl/KerberosRealmSettingsTest.java     |   9 +-
 .../authn/spnego/impl/KerberosSettingsTest.java    |   7 +-
 .../spnego/impl/SPNEGOAuthnControllerTest.java     |   1 +
 .../spnego/impl/SPNEGOAutoLoginManagerTest.java    |   1 +
 .../idp/authn/spnego/impl/SPNEGOContextTest.java   |   1 +
 39 files changed, 187 insertions(+), 111 deletions(-)

diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/AuthenticationContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/AuthenticationContextTest.java
index 06b114c55..d69643707 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/AuthenticationContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/AuthenticationContextTest.java
@@ -15,7 +15,6 @@
 package net.shibboleth.idp.authn.context.impl;
 
 import java.time.Instant;
-import java.util.Arrays;
 
 import javax.security.auth.Subject;
 
@@ -72,7 +71,7 @@ public class AuthenticationContextTest {
         final AuthenticationContext ctx = new AuthenticationContext();
         Assert.assertTrue(ctx.getActiveResults().isEmpty());
         
-        ctx.setActiveResults(Arrays.asList(result));
+        ctx.setActiveResults(CollectionSupport.singletonList((result)));
 
         Assert.assertEquals(ctx.getActiveResults().size(), 1);
         Assert.assertEquals(ctx.getActiveResults().get("test"), result);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
index 74cfcdeee..6f55cd9fc 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
@@ -68,6 +68,7 @@ import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
 
 /** {@link DefaultAuthenticationResultSerializer} unit test. */
+ at SuppressWarnings("javadoc")
 public class DefaultAuthenticationResultSerializerTest {
 
     private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
@@ -80,7 +81,7 @@ public class DefaultAuthenticationResultSerializerTest {
     
     private static final long ACTIVITY = 1378827556778L;
 
-    private static final String entityCertBase64 = 
+    @Nonnull private static final String entityCertBase64 = 
             "MIIDjDCCAnSgAwIBAgIBKjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl" +
             "cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA2MTIwOVoX" +
             "DTE3MDQwNjA2MTIwOVowMTESMBAGA1UEChMJSW50ZXJuZXQyMRswGQYDVQQDExJm" +
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
index 0226adb45..b8c352940 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
@@ -33,6 +33,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractRemoteUser} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractRemoteUserTest extends BaseAuthenticationContextTest {
     
     private ExtractRemoteUser action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
index 4f4cd999d..834735af0 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
@@ -32,6 +32,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractUserAgentAddress} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractUserAgentAddressTest extends BaseAuthenticationContextTest {
     
     private ExtractUserAgentAddress action;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
index 513d4157a..568a257ac 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
@@ -30,6 +30,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractUserAgentIdentifier} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractUserAgentIdentifierTest extends BaseAuthenticationContextTest {
     
     private ExtractUserAgentIdentifier action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
index 3da486b76..df696b960 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
@@ -32,6 +32,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractUsernamePasswordFromBasicAuth} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractUsernamePasswordFromBasicAuthTest extends BaseAuthenticationContextTest {
     
     private ExtractUsernamePasswordFromBasicAuth action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
index 0cbcd8179..cfbdbd235 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
@@ -30,6 +30,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractUsernamePasswordFromFormRequest} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractUsernamePasswordFromFormRequestTest extends BaseAuthenticationContextTest {
     
     private ExtractUsernamePasswordFromFormRequest action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
index 303c6e484..6bb8f7d57 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
@@ -18,6 +18,8 @@ package net.shibboleth.idp.authn.impl;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.security.x509.X509Support;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.webflow.execution.Event;
@@ -34,9 +36,10 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractX509CertificateFromRequest} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractX509CertificateFromRequestTest extends BaseAuthenticationContextTest {
     
-    private String entityCertBase64 = 
+    @Nonnull private final String entityCertBase64 = 
         "MIIDjDCCAnSgAwIBAgIBKjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl" +
         "cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA2MTIwOVoX" +
         "DTE3MDQwNjA2MTIwOVowMTESMBAGA1UEChMJSW50ZXJuZXQyMRswGQYDVQQDExJm" +
@@ -57,7 +60,7 @@ public class ExtractX509CertificateFromRequestTest extends BaseAuthenticationCon
         "uLdeRCZmi93vq1D4JVGsXC4UaHjg114+a+9q0XZdz6a1UW4pt1ryXIPotCS62M71" +
         "pkJf5neHUinKAqgoRfPXowudZg1Zl8DjzoOBn+MNHRrR5KYbVGvdHcxoJLCwVB/v";
         
-    private String otherCert1Base64 = 
+    @Nonnull private final String otherCert1Base64 = 
         "MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl" +
         "cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX" +
         "DTE3MDUyMjIwMTYxMVowGjEYMBYGA1UEAxMPaWRwLmV4YW1wbGUub3JnMIIBtjCC" +
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByForceAuthnTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByForceAuthnTest.java
index f92ffe666..103ba0750 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByForceAuthnTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByForceAuthnTest.java
@@ -28,6 +28,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link FilterFlowsByForcedAuthn} unit test. */
+ at SuppressWarnings("javadoc")
 public class FilterFlowsByForceAuthnTest extends BaseAuthenticationContextTest {
     
     private FilterFlowsByForcedAuthn action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java
index 0efd30da2..6d4b780b7 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java
@@ -25,6 +25,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link FilterFlowsByNonBrowserSupport} unit test. */
+ at SuppressWarnings("javadoc")
 public class FilterFlowsByNonBrowserSupportTest extends BaseAuthenticationContextTest {
     
     private FilterFlowsByNonBrowserSupport action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
index 5907c096a..222bc9efd 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
@@ -63,6 +63,7 @@ public class HTPasswdCredentialValidatorTest extends BaseAuthenticationContextTe
         validator.setId("htpasswdtest");
         
         action = new ValidateCredentials();
+        assert validator != null;
         action.setValidators(CollectionSupport.singletonList(validator));
         
         final Map<String,Collection<String>> mappings = new HashMap<>();
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
index c804acf93..3f9dac6a6 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
@@ -102,6 +102,7 @@ public class JAASCredentialValidatorTest extends BaseAuthenticationContextTest {
         validator.setId("jaastest");
         
         action = new ValidateCredentials();
+        assert validator != null;
         action.setValidators(CollectionSupport.singletonList(validator));
         
         final Map<String,Collection<String>> mappings = new HashMap<>();
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
index b0ebbfcef..31231bed6 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
@@ -17,6 +17,8 @@ package net.shibboleth.idp.authn.impl;
 import java.io.File;
 import java.net.URISyntaxException;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
 
@@ -30,9 +32,10 @@ import org.testng.annotations.Test;
 /**
  * Test for {@link KeystoreResourceCredentialConfig}.
  */
+ at SuppressWarnings("javadoc")
 public class KeystoreResourceCredentialConfigTest {
 
-    private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
+    @Nonnull private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
 
     @DataProvider(name = "resources")
     public Object[][] getResources() throws Exception {
@@ -48,7 +51,8 @@ public class KeystoreResourceCredentialConfigTest {
         };
     }
 
-    @Test(dataProvider = "resources") public void createSSLContextInitializer(final Resource truststore, final Resource keystore) throws Exception {
+    @Test(dataProvider = "resources") public void createSSLContextInitializer(@Nonnull final Resource truststore,
+            @Nonnull final Resource keystore) throws Exception {
         final KeystoreResourceCredentialConfig config = new KeystoreResourceCredentialConfig();
         config.setTruststore(truststore);
         config.setKeystore(keystore);
@@ -59,8 +63,9 @@ public class KeystoreResourceCredentialConfigTest {
         Assert.assertNotNull(init.getKeyManagers()[0]);
     }
 
-    private static Resource getFileSystemResource(final String path) throws URISyntaxException {
+    @Nonnull private static Resource getFileSystemResource(@Nonnull final String path) throws URISyntaxException {
         return ResourceHelper.of(new FileSystemResource(new File(X509ResourceCredentialConfigTest.class.getResource(
                 path).toURI())));
     }
-}
+
+}
\ No newline at end of file
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
index 09e512c1d..57a58de5b 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
@@ -125,6 +125,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         validator.setId("ldaptest");
         
         action = new ValidateCredentials();
+        assert validator != null;
         action.setValidators(CollectionSupport.singletonList(validator));
 
         final Map<String, Collection<String>> mappings = new HashMap<>();
@@ -148,7 +149,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
     }
 
     @Test public void testMissingUser() throws ComponentInitializationException {
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
@@ -162,7 +163,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
     }
 
     @Test public void testMissingUser2() throws ComponentInitializationException {
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         ac.ensureSubcontext(UsernamePasswordContext.class);
@@ -185,7 +186,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "foo");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         ac.ensureSubcontext(UsernamePasswordContext.class);
@@ -206,7 +207,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "foo");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -237,7 +238,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -265,7 +266,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "foo");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -296,7 +297,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "foo");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
@@ -329,7 +330,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -353,7 +354,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -373,7 +374,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_FAILURE);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         assert aec != null;
         ActionTestingSupport.assertEvent(event, "InvalidPassword");
         Assert.assertEquals(aec.getClassifiedErrors().size(), 1);
@@ -384,11 +385,11 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "bar");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
-        Authenticator errorAuthenticator = new Authenticator(dnResolver, authHandler);
+        final Authenticator errorAuthenticator = new Authenticator(dnResolver, authHandler);
         errorAuthenticator.setResponseHandlers(
             response -> response.setAccountState(
                 new PasswordPolicyAccountState(PasswordPolicyControl.Error.PASSWORD_EXPIRED)));
@@ -408,7 +409,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_FAILURE);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         assert aec != null;
         ActionTestingSupport.assertEvent(event, "ExpiredPassword");
         Assert.assertEquals(aec.getClassifiedErrors().size(), 2);
@@ -420,11 +421,11 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
-        Authenticator errorAuthenticator = new Authenticator(dnResolver, authHandler);
+        final Authenticator errorAuthenticator = new Authenticator(dnResolver, authHandler);
         errorAuthenticator.setResponseHandlers(
             response -> response.setAccountState(
                 new PasswordPolicyAccountState(PasswordPolicyControl.Error.CHANGE_AFTER_RESET)));
@@ -444,19 +445,19 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
-        AuthenticationWarningContext awc = ac.getSubcontext(AuthenticationWarningContext.class);
+        final AuthenticationWarningContext awc = ac.getSubcontext(AuthenticationWarningContext.class);
         assert awc != null && result != null;
 
         ActionTestingSupport.assertEvent(event, "ExpiredPassword");
         Assert.assertEquals(awc.getClassifiedWarnings().size(), 1);
         Assert.assertTrue(awc.isClassifiedWarning("ExpiredPassword"));
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
@@ -466,11 +467,11 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
-        Authenticator warningAuthenticator = new Authenticator(dnResolver, authHandler);
+        final Authenticator warningAuthenticator = new Authenticator(dnResolver, authHandler);
         warningAuthenticator.setResponseHandlers(
             response -> response.setAccountState(
                 new AccountState(new AccountState.DefaultWarning(ZonedDateTime.now(), 10))));
@@ -483,12 +484,12 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
 
         final Event event = action.execute(src);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
 
-        AuthenticationResult result = ac.getAuthenticationResult();
+        final AuthenticationResult result = ac.getAuthenticationResult();
         Assert.assertNotNull(result);
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
@@ -497,15 +498,15 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
 
         ActionTestingSupport.assertEvent(event, "ExpiringPassword");
 
-        AuthenticationWarningContext awc = ac.getSubcontext(AuthenticationWarningContext.class);
+        final AuthenticationWarningContext awc = ac.getSubcontext(AuthenticationWarningContext.class);
         assert awc != null && result != null;
         Assert.assertEquals(awc.getClassifiedWarnings().size(), 1);
         Assert.assertTrue(awc.isClassifiedWarning("ExpiringPassword"));
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
@@ -515,7 +516,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
@@ -529,22 +530,22 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         final Event event = action.execute(src);
         ActionTestingSupport.assertProceedEvent(event);
         
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
 
-        AuthenticationResult result = ac.getAuthenticationResult();
+        final AuthenticationResult result = ac.getAuthenticationResult();
         assert result != null;
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
@@ -554,7 +555,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "change");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         
@@ -578,38 +579,38 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         final Event event = action.execute(src);
         ActionTestingSupport.assertProceedEvent(event);
         
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
 
-        AuthenticationResult result = ac.getAuthenticationResult();
+        final AuthenticationResult result = ac.getAuthenticationResult();
         assert result != null;
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
     }
 
     @Test public void testDefaultFilterSyntax() throws ComponentInitializationException {
-        TemplateSearchDnResolver testResolver = new TemplateSearchDnResolver(new DefaultConnectionFactory("ldap://localhost:10389"),
-                VelocityEngine.newVelocityEngine(), "(uid={user})");
+        final TemplateSearchDnResolver testResolver = new TemplateSearchDnResolver(
+                new DefaultConnectionFactory("ldap://localhost:10389"), VelocityEngine.newVelocityEngine(), "(uid={user})");
         testResolver.setBaseDn("ou=people,dc=shibboleth,dc=net");
 
 
-        Authenticator defaultFilterAuthenticator = new Authenticator(testResolver, authHandler);
+        final Authenticator defaultFilterAuthenticator = new Authenticator(testResolver, authHandler);
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         validator.setAuthenticator(defaultFilterAuthenticator);
@@ -622,38 +623,39 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         final Event event = action.execute(src);
         ActionTestingSupport.assertProceedEvent(event);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
 
-        AuthenticationResult result = ac.getAuthenticationResult();
+        final AuthenticationResult result = ac.getAuthenticationResult();
         assert result != null;
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
     }
 
     @Test public void testCombinedFilterSyntax() throws ComponentInitializationException {
-        TemplateSearchDnResolver testResolver = new TemplateSearchDnResolver(new DefaultConnectionFactory("ldap://localhost:10389"),
+        final TemplateSearchDnResolver testResolver = new TemplateSearchDnResolver(
+                new DefaultConnectionFactory("ldap://localhost:10389"),
                 VelocityEngine.newVelocityEngine(), "(|(mail=$usernamePasswordContext.username)(uid={user}))");
         testResolver.setBaseDn("ou=people,dc=shibboleth,dc=net");
 
 
-        Authenticator defaultFilterAuthenticator = new Authenticator(testResolver, authHandler);
+        final Authenticator defaultFilterAuthenticator = new Authenticator(testResolver, authHandler);
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
         validator.setAuthenticator(defaultFilterAuthenticator);
@@ -666,22 +668,22 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         final Event event = action.execute(src);
         ActionTestingSupport.assertProceedEvent(event);
 
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
 
         final AuthenticationResult result = ac.getAuthenticationResult();
         assert result != null;
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
@@ -691,7 +693,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
@@ -706,21 +708,21 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         final Event event = action.execute(src);
         ActionTestingSupport.assertProceedEvent(event);
         
-        AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
+        final AuthenticationErrorContext aec = ac.getSubcontext(AuthenticationErrorContext.class);
         Assert.assertNull(aec);
-        AuthenticationResult result = ac.getAuthenticationResult();
+        final AuthenticationResult result = ac.getAuthenticationResult();
         assert result != null ;
-        LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
+        final LDAPResponseContext lrc = ac.getSubcontext(LDAPResponseContext.class);
         assert lrc != null;
         final AuthenticationResponse lar = lrc.getAuthenticationResponse();
         assert lar != null;
         Assert.assertEquals(lar.getAuthenticationResultCode(),
                 AuthenticationResultCode.AUTHENTICATION_HANDLER_SUCCESS);
 
-        UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
+        final UsernamePrincipal up = result.getSubject().getPrincipals(UsernamePrincipal.class).iterator().next();
         Assert.assertNotNull(up);
         Assert.assertEquals(up.getName(), "PETER_THE_PRINCIPAL");
-        LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
+        final LdapPrincipal lp = result.getSubject().getPrincipals(LdapPrincipal.class).iterator().next();
         Assert.assertNotNull(lp);
         Assert.assertEquals(lp.getName(), "PETER_THE_PRINCIPAL");
         Assert.assertNotNull(lp.getLdapEntry());
@@ -730,7 +732,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
         getMockHttpServletRequest(action).addParameter("username", "PETER_THE_PRINCIPAL");
         getMockHttpServletRequest(action).addParameter("password", "changeit");
 
-        AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
+        final AuthenticationContext ac = prc.getSubcontext(AuthenticationContext.class);
         assert ac != null;
         ac.setAttemptedFlow(authenticationFlows.get(0));
 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
index dd52a9328..82d7c3d32 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
@@ -31,6 +31,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link PopulateSubjectCanonicalizationContext} unit test and base class for further action tests. */
+ at SuppressWarnings("javadoc")
 public class PopulateSubjectCanonicalizationContextTest {
 
     protected List<SubjectCanonicalizationFlowDescriptor> c14nFlows;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
index 50a43d906..d9625ea43 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
@@ -31,6 +31,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link PreserveAuthenticationFlowState} unit test. */
+ at SuppressWarnings("javadoc")
 public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationContextTest {
     
     private PreserveAuthenticationFlowState action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlowTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlowTest.java
index 707335082..18abbf1ff 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlowTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlowTest.java
@@ -25,6 +25,7 @@ import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.shared.logic.PredicateSupport;
 
 /** {@link SelectSubjectCanonicalizationFlow} unit test. */
+ at SuppressWarnings("javadoc")
 public class SelectSubjectCanonicalizationFlowTest extends PopulateSubjectCanonicalizationContextTest {
     
     private SelectSubjectCanonicalizationFlow action;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalizationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalizationTest.java
index d21e951c0..3742ff045 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalizationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalizationTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link SimpleSubjectCanonicalization} unit test. */
+ at SuppressWarnings("javadoc")
 public class SimpleSubjectCanonicalizationTest extends BaseAuthenticationContextTest {
     
     private SimpleSubjectCanonicalization action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
index af066dcc9..0d40c166c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/StorageBackedAccountLockoutManagerTest.java
@@ -14,20 +14,23 @@
 
 package net.shibboleth.idp.authn.impl;
 
+import static org.testng.Assert.*;
 
 import java.time.Duration;
+import java.util.List;
 
 import org.opensaml.storage.impl.MemoryStorageService;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.authn.context.LockoutManagerContext;
 import net.shibboleth.idp.authn.context.UsernamePasswordContext;
 import net.shibboleth.idp.authn.impl.StorageBackedAccountLockoutManager.UsernameIPLockoutKeyStrategy;
 import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
@@ -67,52 +70,73 @@ public class StorageBackedAccountLockoutManagerTest extends BaseAuthenticationCo
         assert authCtx != null;
 
         authCtx.clearSubcontexts();
-        Assert.assertFalse(manager.check(prc));
-        Assert.assertFalse(manager.increment(prc));
-        Assert.assertFalse(manager.clear(prc));
+        assertFalse(manager.check(prc));
+        assertFalse(manager.increment(prc));
+        assertFalse(manager.clear(prc));
     }
     
     @Test public void one() {
-        Assert.assertFalse(manager.check(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertFalse(manager.check(prc));
-        Assert.assertTrue(manager.clear(prc));
+        assertFalse(manager.check(prc));
+        assertTrue(manager.increment(prc));
+        assertFalse(manager.check(prc));
+        assertTrue(manager.clear(prc));
     }
     
     @Test public void two() {
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertFalse(manager.check(prc));
-        Assert.assertTrue(manager.clear(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertFalse(manager.check(prc));
+        assertTrue(manager.clear(prc));
     }
     
     @Test public void threeSlow() throws InterruptedException {
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
         Thread.sleep(4000);
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertFalse(manager.check(prc));
-        Assert.assertTrue(manager.clear(prc));
+        assertTrue(manager.increment(prc));
+        assertFalse(manager.check(prc));
+        assertTrue(manager.clear(prc));
     }
 
     @Test public void threeFast() throws InterruptedException {
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.check(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.check(prc));
         Thread.sleep(2000);
-        Assert.assertTrue(manager.check(prc));
+        assertTrue(manager.check(prc));
     }
 
     @Test public void waitForUnlock() throws InterruptedException {
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.increment(prc));
-        Assert.assertTrue(manager.check(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.check(prc));
         Thread.sleep(4000);
-        Assert.assertTrue(manager.check(prc));
+        assertTrue(manager.check(prc));
         Thread.sleep(1150);
-        Assert.assertFalse(manager.check(prc));
+        assertFalse(manager.check(prc));
     }
 
+    @Test public void testEnum() {
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.check(prc));
+
+        ((MockHttpServletRequest) src.getExternalContext().getNativeRequest()).setRemoteAddr("192.168.1.2");
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.increment(prc));
+        assertTrue(manager.check(prc));
+        
+        prc.ensureSubcontext(LockoutManagerContext.class).setKey("jdoe!");
+        
+        final List<String> candidates = CollectionSupport.listOf("jdoe!192.168.1.1", "jdoe!192.168.1.2");
+        final Iterable<String> keys = manager.enumerate(prc);
+        for (final String key : keys) {
+            assertTrue(candidates.contains(key));
+        }
+    }
+    
 }
\ No newline at end of file
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthenticationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthenticationTest.java
index 579488f8d..2a7ee7a2c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthenticationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthenticationTest.java
@@ -25,6 +25,7 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link TransitionMultiFactorAuthentication} unit test. */
+ at SuppressWarnings("javadoc")
 public class TransitionMultiFactorAuthenticationTest extends BaseMultiFactorAuthenticationContextTest {
     
     private TransitionMultiFactorAuthentication action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
index 607a8523e..0d7ce5912 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
@@ -42,6 +42,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ValidateExternalAuthentication} unit test. */
+ at SuppressWarnings("javadoc")
 public class ValidateExternalAuthenticationTest extends BaseAuthenticationContextTest {
     
     private ExternalAuthentication ext;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateFunctionResultTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateFunctionResultTest.java
index a2f72bcdf..ffb5343a3 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateFunctionResultTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateFunctionResultTest.java
@@ -37,6 +37,7 @@ import org.testng.annotations.Test;
 import com.google.common.base.Functions;
 
 /** {@link ValidateFunctionResult} unit test. */
+ at SuppressWarnings("javadoc")
 public class ValidateFunctionResultTest extends BaseAuthenticationContextTest {
     
     private ValidateFunctionResult action;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
index fcdfda55b..320391cb4 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ValidateRemoteUser} unit test. */
+ at SuppressWarnings("javadoc")
 public class ValidateRemoteUserTest extends BaseAuthenticationContextTest {
     
     private ValidateRemoteUser action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalizationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalizationTest.java
index 80c247e75..fcdcc12fd 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalizationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalizationTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link X500SubjectCanonicalization} unit test. */
+ at SuppressWarnings("javadoc")
 public class X500SubjectCanonicalizationTest extends BaseAuthenticationContextTest {
     
     private X500SubjectCanonicalization action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
index b0ac00c67..490828408 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
@@ -104,6 +104,7 @@ public class X509CertificateCredentialValidatorTest extends BaseAuthenticationCo
         validator.setId("x509");
         
         action = new ValidateCredentials();
+        assert validator != null;
         action.setValidators(CollectionSupport.singletonList(validator));
         final MockHttpServletRequest request = new MockHttpServletRequest();
         action.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ProxyFilterTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ProxyFilterTest.java
index 34700d276..258f2ef1d 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ProxyFilterTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ProxyFilterTest.java
@@ -18,6 +18,8 @@ package net.shibboleth.idp.authn.impl;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -31,9 +33,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link X509ProxyFilter} unit test. */
+ at SuppressWarnings("javadoc")
 public class X509ProxyFilterTest extends BaseAuthenticationContextTest {
     
-    private String entityCertBase64 = 
+    @Nonnull private final String entityCertBase64 = 
             "-----BEGIN CERTIFICATE-----\n" +
             "MIIDjDCCAnSgAwIBAgIBKjANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl" +
             "cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDQwOTA2MTIwOVoX" +
@@ -56,7 +59,7 @@ public class X509ProxyFilterTest extends BaseAuthenticationContextTest {
             "pkJf5neHUinKAqgoRfPXowudZg1Zl8DjzoOBn+MNHRrR5KYbVGvdHcxoJLCwVB/v" +
             "\n-----END CERTIFICATE-----\n";
     
-    private String otherCert1Base64 = 
+    @Nonnull private final String otherCert1Base64 = 
             "-----BEGIN CERTIFICATE-----\n" +
             "MIIECTCCAvGgAwIBAgIBMzANBgkqhkiG9w0BAQUFADAtMRIwEAYDVQQKEwlJbnRl" +
             "cm5ldDIxFzAVBgNVBAMTDmNhLmV4YW1wbGUub3JnMB4XDTA3MDUyNTIwMTYxMVoX" +
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
index 5f23917e2..560205647 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
@@ -17,6 +17,8 @@ package net.shibboleth.idp.authn.impl;
 import java.io.File;
 import java.net.URISyntaxException;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.shared.resource.Resource;
 import net.shibboleth.shared.spring.resource.ResourceHelper;
 
@@ -30,6 +32,7 @@ import org.testng.annotations.Test;
 /**
  * Test for {@link X509ResourceCredentialConfig}.
  */
+ at SuppressWarnings("javadoc")
 public class X509ResourceCredentialConfigTest {
 
     private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
@@ -50,7 +53,8 @@ public class X509ResourceCredentialConfigTest {
         };
     }
 
-    @Test(dataProvider = "resources") public void createSSLContextInitializer(final Resource trustCertificates, final Resource authenticationCertificate, final Resource authenticationKey) throws Exception {
+    @Test(dataProvider = "resources") public void createSSLContextInitializer(@Nonnull final Resource trustCertificates,
+            @Nonnull final Resource authenticationCertificate, @Nonnull final Resource authenticationKey) throws Exception {
         final X509ResourceCredentialConfig config = new X509ResourceCredentialConfig();
         config.setTrustCertificates(trustCertificates);
         config.setAuthenticationCertificate(authenticationCertificate);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
index fd37b1e59..b98906eef 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/ExactPrincipalEvalPredicateFactoryTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /** {@link ExactPrincipalEvalPredicateFactory} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExactPrincipalEvalPredicateFactoryTest {
     
     private ExactPrincipalEvalPredicateFactory factory;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
index c296ed47a..097f09fa5 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/InexactPrincipalEvalPredicateFactoryTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /** {@link InexactPrincipalEvalPredicateFactory} unit test. */
+ at SuppressWarnings("javadoc")
 public class InexactPrincipalEvalPredicateFactoryTest {
     
     private InexactPrincipalEvalPredicateFactory factory;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/X500PrincipalSerializerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/X500PrincipalSerializerTest.java
index 03a442667..2be0abce2 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/X500PrincipalSerializerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/X500PrincipalSerializerTest.java
@@ -23,6 +23,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /** Unit test for {@link X500PrincipalSerializer}. */
+ at SuppressWarnings("javadoc")
 public class X500PrincipalSerializerTest {
 
     X500PrincipalSerializer serializer;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunctionTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunctionTest.java
index 509445bcd..4677800f2 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunctionTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/DiscoveryProfileRequestFunctionTest.java
@@ -35,6 +35,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link DiscoveryProfileRequestFunction} unit test. */
+ at SuppressWarnings("javadoc")
 public class DiscoveryProfileRequestFunctionTest extends BaseAuthenticationContextTest {
     
     private DiscoveryProfileRequestFunction function; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
index 640f55a61..04fe01c45 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
@@ -29,6 +29,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
 /** {@link ExtractDiscoveryResponse} unit test. */
+ at SuppressWarnings("javadoc")
 public class ExtractDiscoveryResponseTest extends BaseAuthenticationContextTest {
     
     private ExtractDiscoveryResponse action; 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContextTest.java
index a5b4648ee..fd74830b2 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContextTest.java
@@ -26,6 +26,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** Unit test for {@link InitializeProxyProfileRequestContext}. */
+ at SuppressWarnings("javadoc")
 public class InitializeProxyProfileRequestContextTest {
 
     private ProfileRequestContext prc;
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheConditionTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheConditionTest.java
index d5eb3ee63..8c7fc0a9f 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheConditionTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/revocation/impl/RevocationCacheConditionTest.java
@@ -16,13 +16,13 @@ package net.shibboleth.idp.authn.revocation.impl;
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Arrays;
 
 import javax.security.auth.Subject;
 
 import net.shibboleth.idp.authn.AuthenticationResult;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.FunctionSupport;
 
@@ -34,6 +34,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link RevocationCacheCondition} unit test. */
+ at SuppressWarnings("javadoc")
 public class RevocationCacheConditionTest extends BaseAuthenticationContextTest {
     
     private MemoryStorageService storageService;
@@ -74,7 +75,7 @@ public class RevocationCacheConditionTest extends BaseAuthenticationContextTest
         final AuthenticationResult active = authenticationFlows.get(1).newAuthenticationResult(new Subject());
         final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class);
         assert authCtx != null;
-        authCtx.setActiveResults(Arrays.asList(active));
+        authCtx.setActiveResults(CollectionSupport.singletonList(active));
 
         Assert.assertTrue(active.test(prc));
     }
@@ -83,7 +84,7 @@ public class RevocationCacheConditionTest extends BaseAuthenticationContextTest
         final AuthenticationResult active = authenticationFlows.get(1).newAuthenticationResult(new Subject());
         final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class);
         assert authCtx != null;
-        authCtx.setActiveResults(Arrays.asList(active));
+        authCtx.setActiveResults(CollectionSupport.singletonList(active));
 
         revocationCache.revoke(RevocationCacheCondition.REVOCATION_CONTEXT,
                 RevocationCacheCondition.PRINCIPAL_REVOCATION_PREFIX + "jdoe",
@@ -97,7 +98,7 @@ public class RevocationCacheConditionTest extends BaseAuthenticationContextTest
         final AuthenticationResult active = authenticationFlows.get(1).newAuthenticationResult(new Subject());
         final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class);
         assert authCtx != null;
-        authCtx.setActiveResults(Arrays.asList(active));
+        authCtx.setActiveResults(CollectionSupport.singletonList(active));
 
         revocationCache.revoke(RevocationCacheCondition.REVOCATION_CONTEXT,
                 RevocationCacheCondition.PRINCIPAL_REVOCATION_PREFIX + "jdoe",
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettingsTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettingsTest.java
index 1abd0adc7..43aec183c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettingsTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettingsTest.java
@@ -14,19 +14,22 @@
 
 package net.shibboleth.idp.authn.spnego.impl;
 
+import javax.annotation.Nonnull;
+
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import net.shibboleth.shared.component.ComponentInitializationException;
 
+ at SuppressWarnings("javadoc")
 public class KerberosRealmSettingsTest {
 
-    protected static String SERVICE_PRINCIPAL = "HTTP/aai-logon.domain_a.com at DOMAIN_A.COM";
+    @Nonnull protected static final String SERVICE_PRINCIPAL = "HTTP/aai-logon.domain_a.com at DOMAIN_A.COM";
 
-    protected static String KEYTAB = "/opt/kerberos/http_domainA.keytab";
+    @Nonnull protected static final String KEYTAB = "/opt/kerberos/http_domainA.keytab";
 
-    protected static String PASSWORD = "secret";
+    @Nonnull protected static final String PASSWORD = "secret";
     
     private Object nullObj;
 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosSettingsTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosSettingsTest.java
index e1e75344f..47a5d3325 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosSettingsTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosSettingsTest.java
@@ -19,16 +19,19 @@ import static org.testng.Assert.assertEquals;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import net.shibboleth.shared.component.ComponentInitializationException;
 
+ at SuppressWarnings("javadoc")
 public class KerberosSettingsTest {
 
-    protected static String SERVICE_PRINCIPAL = "HTTP/aai-logon.domain_a.com at DOMAIN_A.COM";
+    @Nonnull protected static final String SERVICE_PRINCIPAL = "HTTP/aai-logon.domain_a.com at DOMAIN_A.COM";
 
-    protected static String KEYTAB = "/opt/kerberos/http_domainA.keytab";
+    @Nonnull protected static final String KEYTAB = "/opt/kerberos/http_domainA.keytab";
 
     protected List<KerberosRealmSettings> realms;
 
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnControllerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnControllerTest.java
index 4ada76dea..2576b5efc 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnControllerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnControllerTest.java
@@ -59,6 +59,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+ at SuppressWarnings("javadoc")
 public class SPNEGOAuthnControllerTest {
 
     private static final String TEST_CONVERSATION_KEY = "e1s1";
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
index 788e0f412..e1527f39d 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAutoLoginManagerTest.java
@@ -26,6 +26,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import net.shibboleth.shared.net.CookieManager;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
+ at SuppressWarnings("javadoc")
 public class SPNEGOAutoLoginManagerTest {
 
     /**
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOContextTest.java
index 597f0f89c..9baba59a6 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOContextTest.java
@@ -20,6 +20,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /** {@link SPNEGOContextTest} unit test. */
+ at SuppressWarnings("javadoc")
 public class SPNEGOContextTest {
 
     @Test

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list