[java-oidc-common] branch main updated: Suppress null warnings in tests

Phil Smart philip.smart at jisc.ac.uk
Fri Apr 5 13:27:56 UTC 2024


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

philsmart pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=97ebcd2bf208f12b7ae1307aa1ea774d95ee7226

The following commit(s) were added to refs/heads/main by this push:
     new 97ebcd2  Suppress null warnings in tests
97ebcd2 is described below

commit 97ebcd2bf208f12b7ae1307aa1ea774d95ee7226
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Apr 5 14:27:53 2024 +0100

    Suppress null warnings in tests
---
 .../impl/BaseMetadataCredentialResolverTest.java          |  2 +-
 ...ientInformationClientSecretCredentialResolverTest.java |  3 ++-
 .../impl/ClientInformationCredentialResolverTest.java     |  2 +-
 .../impl/ClientSecretCriterionCredentialResolverTest.java |  2 +-
 .../EvaluableMACKeyLengthCredentialCriterionTest.java     |  2 +-
 .../impl/LocalJOSEObjectCredentialResolverTest.java       |  1 +
 .../impl/ProviderMetadataCredentialResolverTest.java      |  1 +
 .../impl/CheckClientJWTDecryptionConfigurationTest.java   |  4 ++--
 .../impl/ClientInformationJWTTrustEngineTest.java         |  6 +++---
 .../oidc/security/impl/EncryptJWTHandlerTest.java         |  1 +
 .../impl/ExplicitKeySignedJWTTrustEngineTest.java         |  6 +++++-
 .../oidc/security/impl/JWETokenDecrypterTest.java         |  6 +++++-
 .../oidc/security/impl/JWSAssemblyUtilsTest.java          |  7 ++++---
 .../shibboleth/oidc/security/impl/JWSTokenSignerTest.java |  2 +-
 .../security/impl/JWTSignatureValidationUtilTest.java     |  2 +-
 ...etadataDataEncryptionAlgorithmsLookupStrategyTest.java |  1 +
 ...eyTransportEncryptionAlgorithmsLookupStrategyTest.java |  1 +
 .../oidc/security/impl/support/TestCredentialHelper.java  |  1 +
 ...InformationSignatureSigningParametersResolverTest.java |  3 ++-
 ...DefaultDataEncryptionAlgorithmsLookupStrategyTest.java |  1 +
 .../impl/DefaultEncryptionParametersResolverTest.java     |  2 +-
 .../impl/RelyingPartySigningParametersResolverTest.java   |  2 +-
 .../security/jwt/claims/impl/ACRClaimsValidatorTest.java  |  2 +-
 .../jwt/claims/impl/AccessTokenHashValidatorTest.java     |  2 +-
 .../jwt/claims/impl/AudienceClaimsValidatorTest.java      |  2 +-
 .../impl/AuthenticationAudienceClaimsValidatorTest.java   |  2 +-
 .../impl/AuthenticationTimeClaimsValidatorTest.java       |  2 +-
 .../jwt/claims/impl/ChainingJWTClaimsValidatorTest.java   | 15 ++++++++-------
 .../jwt/claims/impl/ExactMatchClaimsValidatorTest.java    |  3 ++-
 .../jwt/claims/impl/ExpiryClaimsValidatorTest.java        |  3 ++-
 .../jwt/claims/impl/IssuedAtClaimsValidatorTest.java      |  2 +-
 .../jwt/claims/impl/JWTIdentifierClaimsValidatorTest.java |  6 +++---
 .../jwt/claims/impl/NotBeforeClaimsValidatorTest.java     |  3 ++-
 .../jwt/claims/impl/ProhibitedClaimsValidatorTest.java    |  3 ++-
 .../jwt/claims/impl/RequiredClaimsValidatorTest.java      |  3 ++-
 35 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
index 0bc6a51..cca1c0b 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
@@ -60,7 +60,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
  * 
  * @param <T> credential type
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public abstract class BaseMetadataCredentialResolverTest<T extends BasicJOSEObjectCredentialResolver> {
 
     /** A remote JWKSet.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationClientSecretCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationClientSecretCredentialResolverTest.java
index 79af86b..cd6a0bc 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationClientSecretCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationClientSecretCredentialResolverTest.java
@@ -48,6 +48,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 /**
  * Unit tests for {@link ClientInformationClientSecretCredentialResolver}.
  */
+ at SuppressWarnings(value={"javadoc","null"})
 public class ClientInformationClientSecretCredentialResolverTest {
     
     private static final ClassPathResource CLIENT_INFORMATION_REMOTE_KEYS = 
@@ -56,7 +57,7 @@ public class ClientInformationClientSecretCredentialResolverTest {
     private static final ClassPathResource CLIENT_INFORMATION_SECRET = 
             new ClassPathResource("/metadata/test-resolver-client-information-secret.json");
 
-    private ClientInformationClientSecretCredentialResolver resolver =
+    private final ClientInformationClientSecretCredentialResolver resolver =
             new ClientInformationClientSecretCredentialResolver();
 
     private CriteriaSet criteria;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
index 23e6880..52993ad 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
@@ -43,7 +43,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 /**
  * Unit tests for {@link ClientInformationCredentialResolver}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ClientInformationCredentialResolverTest extends BaseMetadataCredentialResolverTest<ClientInformationCredentialResolver> {
     
     @Nonnull private static final ClassPathResource CLIENT_INFORMATION_REMOTE_KEYS = 
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientSecretCriterionCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientSecretCriterionCredentialResolverTest.java
index 724c7aa..14fcb9a 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientSecretCriterionCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientSecretCriterionCredentialResolverTest.java
@@ -44,7 +44,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
 /** Tests for {@link ClientSecretCriterionCredentialResolver}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ClientSecretCriterionCredentialResolverTest {
 
     @Nonnull private static final String CLIENT_SECRET = "aPdSgVkXp2s5v8y/B?E(H+MbQeThWmZq";
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/EvaluableMACKeyLengthCredentialCriterionTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/EvaluableMACKeyLengthCredentialCriterionTest.java
index 8cd75ee..6533f95 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/EvaluableMACKeyLengthCredentialCriterionTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/EvaluableMACKeyLengthCredentialCriterionTest.java
@@ -23,7 +23,7 @@ import com.nimbusds.jose.util.StandardCharset;
 import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.logic.ConstraintViolationException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class EvaluableMACKeyLengthCredentialCriterionTest {
     
     /** A 256 bit client_secret.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
index dde448c..83ba033 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
@@ -310,6 +310,7 @@ public class LocalJOSEObjectCredentialResolverTest {
             key = theKey;
         }
 
+        @SuppressWarnings("null")
         @Override
         @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                 throws ResolverException {
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
index 749c7de..cfac808 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
@@ -50,6 +50,7 @@ public class ProviderMetadataCredentialResolverTest extends BaseMetadataCredenti
         return resolver;
     }
 
+    @SuppressWarnings("null")
     @Override
     protected CriteriaSet buildInitialCriteriaSet() throws Exception {
         criteria = new CriteriaSet();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/CheckClientJWTDecryptionConfigurationTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/CheckClientJWTDecryptionConfigurationTest.java
index a6a4b62..17223ce 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/CheckClientJWTDecryptionConfigurationTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/CheckClientJWTDecryptionConfigurationTest.java
@@ -36,7 +36,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 /**
  * Unit tests for {@link CheckClientJWTDecryptionConfiguration}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class CheckClientJWTDecryptionConfigurationTest {
 
     protected CheckClientJWTDecryptionConfiguration action;
@@ -176,7 +176,7 @@ public class CheckClientJWTDecryptionConfigurationTest {
     }
 
     protected EncryptedJWT mockEncryptedJWT() {
-        EncryptedJWT jwt = Mockito.mock(EncryptedJWT.class);
+        final EncryptedJWT jwt = Mockito.mock(EncryptedJWT.class);
         Mockito.when(jwt.getHeader()).thenReturn(new JWEHeader(JWEAlgorithm.parse("mockKeyAlgId"),
                 EncryptionMethod.parse("mockDataAlgId")));
         return jwt;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ClientInformationJWTTrustEngineTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ClientInformationJWTTrustEngineTest.java
index 5382b80..9345057 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ClientInformationJWTTrustEngineTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ClientInformationJWTTrustEngineTest.java
@@ -54,7 +54,7 @@ import net.shibboleth.shared.resolver.ResolverException;
 /** 
  * Tests for the {@link ClientInformationJWTTrustEngine}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ClientInformationJWTTrustEngineTest {
 
     private ClientInformationJWTTrustEngine engine;
@@ -73,7 +73,7 @@ public class ClientInformationJWTTrustEngineTest {
         setup(defaultAlgValue, info -> "RS256");
     }
     
-    public void setup(final String defaultAlgValue, Function<OIDCClientInformation, String> sigAlgLookup)
+    public void setup(final String defaultAlgValue, final Function<OIDCClientInformation, String> sigAlgLookup)
             throws JOSEException {
         key = new ECKeyGenerator(Curve.P_256).keyID("123").generate();
 
@@ -103,7 +103,7 @@ public class ClientInformationJWTTrustEngineTest {
                 defaultAlgValue);
     }
 
-    public void setupSymmetric(final String defaultAlgValue, Function<OIDCClientInformation, String> sigAlgLookup) {
+    public void setupSymmetric(final String defaultAlgValue, final Function<OIDCClientInformation, String> sigAlgLookup) {
         final CredentialResolver credResolver = new CredentialResolver() {
 
             @Nullable public Credential resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
index 8f07521..d5b306c 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
@@ -221,6 +221,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
         
     }
     
+    @SuppressWarnings("null")
     @Test
     public void testKeyWrap_Success() throws Exception {
         
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
index 100b1f7..fbb476d 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngineTest.java
@@ -69,7 +69,7 @@ import net.shibboleth.shared.resolver.ResolverException;
  * <p>We can not test a JWT with an in-line symmetric key (oct type) JWK as Nimbus will not (correctly)
  * parse it. Hence we assume the trust engine could never be passed such an invalid JWT.</p>
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ExplicitKeySignedJWTTrustEngineTest {
 
     private ExplicitKeySignedJWTTrustEngine engine;
@@ -186,6 +186,7 @@ public class ExplicitKeySignedJWTTrustEngineTest {
         
         credResolver = new MockAbstractFunctionalCredentialResolver() {
 
+            @Override
             @Nullable public Credential resolveSingle(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
                 try {
                     return TestCredentialHelper.createClientSecretCredential(CLIENT_SECRET).toSigningCredential();
@@ -195,6 +196,7 @@ public class ExplicitKeySignedJWTTrustEngineTest {
                 }
             }
 
+            @Override
             @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                     throws ResolverException {
                 final Credential cred = resolveSingle(criteria);
@@ -223,6 +225,7 @@ public class ExplicitKeySignedJWTTrustEngineTest {
         
         credResolver = new MockAbstractFunctionalCredentialResolver() {
 
+            @Override
             @Nullable public Credential resolveSingle(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
                 try {
                     return TestCredentialHelper.createClientSecretCredential(CLIENT_SECRET).toSigningCredential();
@@ -232,6 +235,7 @@ public class ExplicitKeySignedJWTTrustEngineTest {
                 }
             }
 
+            @Override
             @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                     throws ResolverException {
                 final Credential cred = resolveSingle(criteria);
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWETokenDecrypterTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWETokenDecrypterTest.java
index 3ffaca7..d8ec948 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWETokenDecrypterTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWETokenDecrypterTest.java
@@ -70,7 +70,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
 /** Tests for the {@link JWETokenDecrypter}.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class JWETokenDecrypterTest {
     
     private JWETokenDecrypter decrypter;
@@ -690,6 +690,7 @@ public class JWETokenDecrypterTest {
             key = theKey;
         }
 
+        @Override
         @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                 throws ResolverException {
             final BasicJWKCredential jwkCredential = new BasicJWKCredential();
@@ -718,6 +719,7 @@ public class JWETokenDecrypterTest {
             keys = theKey;
         }
     
+        @Override
         @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                 throws ResolverException {
             final List<Credential> creds = new ArrayList<>();
@@ -754,6 +756,7 @@ public class JWETokenDecrypterTest {
             enc = encryption;                    
         }
 
+        @Override
         @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                 throws ResolverException {
             try {
@@ -776,6 +779,7 @@ public class JWETokenDecrypterTest {
             key = theKey;
         }
 
+        @Override
         @Nonnull protected Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteriaSet)
                 throws ResolverException {
             final BasicJWKCredential jwkCredential = new BasicJWKCredential();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSAssemblyUtilsTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSAssemblyUtilsTest.java
index f11faac..1715d6e 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSAssemblyUtilsTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSAssemblyUtilsTest.java
@@ -86,7 +86,7 @@ public class JWSAssemblyUtilsTest {
         final String signingInput = Base64URL.encode(jsonHeader.getBytes()).toString()+"."+
                 Base64URL.encode(jsonPayload.getBytes());        
         
-        byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
+        final byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
         
         //of note, assertEquals would suffer from a timing attack if used in something other than tests :-)
         assertEquals(sigBase64URL.decode(), computedHmac);
@@ -100,6 +100,7 @@ public class JWSAssemblyUtilsTest {
      * 
      * @throws Exception on error
      */
+    @SuppressWarnings("null")
     @Test
     public final void testAssembleMacJwsCheckWithDifferentKey() throws Exception {
         
@@ -125,7 +126,7 @@ public class JWSAssemblyUtilsTest {
         final String signingInput = Base64URL.encode(jsonHeader.getBytes()).toString()+"."+
                 Base64URL.encode(jsonPayload.getBytes());        
         
-        byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
+        final byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
         
         //of note, assertEquals would suffer from a timing attack if used in something other than tests :-)
         assertNotEquals(sigBase64URL.decode(), computedHmac);
@@ -163,7 +164,7 @@ public class JWSAssemblyUtilsTest {
         final String signingInput = Base64URL.encode(jsonHeader.getBytes()).toString()+"."+
                 Base64URL.encode(jsonPayload.getBytes());        
         
-        byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
+        final byte[] computedHmac = mac.doFinal(signingInput.getBytes(StandardCharsets.UTF_8));
         
         //of note, assertEquals would suffer from a timing attack if used in something other than tests :-)
         assertNotEquals(sigBase64URL.decode(), computedHmac);
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSTokenSignerTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSTokenSignerTest.java
index d2001ac..9952dab 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSTokenSignerTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWSTokenSignerTest.java
@@ -42,7 +42,7 @@ import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
 /**
  * Tests for the {@link JWSTokenSigner}
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class JWSTokenSignerTest {
     
     /** A client_secret to use.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtilTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtilTest.java
index 55cc134..b633ac6 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtilTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/JWTSignatureValidationUtilTest.java
@@ -48,7 +48,7 @@ import net.shibboleth.oidc.security.credential.BasicJWKCredential;
 /**
  * Unit tests for {@link JWTSignatureValidationUtil}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class JWTSignatureValidationUtilTest {
     
     final String invalidJwtEventId = "invalid_jwt";
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
index 4366e93..003650f 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
@@ -83,6 +83,7 @@ public class ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest {
         }
     }
     
+    @SuppressWarnings("null")
     @BeforeMethod
     public void setup() throws ParseException {
         
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
index 14cb296..1a8a380 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
@@ -83,6 +83,7 @@ public class ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest
         }
     }
     
+    @SuppressWarnings("null")
     @BeforeMethod
     public void setup() throws ParseException {
         
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/support/TestCredentialHelper.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/support/TestCredentialHelper.java
index 07c1621..1fdb846 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/support/TestCredentialHelper.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/support/TestCredentialHelper.java
@@ -34,6 +34,7 @@ import net.shibboleth.oidc.security.credential.ClientSecretCredential;
 import net.shibboleth.oidc.security.credential.DefaultClientSecretCredential;
 import net.shibboleth.oidc.security.credential.JWKCredential;
 
+ at SuppressWarnings(value={"javadoc","null"})
 /** Helper that creates different credentials.*/
 public final class TestCredentialHelper {
     
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/ClientInformationSignatureSigningParametersResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/ClientInformationSignatureSigningParametersResolverTest.java
index dcddfd1..78d2cbe 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/ClientInformationSignatureSigningParametersResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/ClientInformationSignatureSigningParametersResolverTest.java
@@ -14,8 +14,8 @@
 
 package net.shibboleth.oidc.security.jose.impl;
 
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -85,6 +85,7 @@ public class ClientInformationSignatureSigningParametersResolverTest {
         }
     }
     
+    @SuppressWarnings("null")
     private CriteriaSet buildCriteria(final List<String> supportedSigningAlgos, final ClassPathResource resource) 
             throws ParseException {
         final CriteriaSet crit = new CriteriaSet();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
index f493745..2db9684 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
@@ -43,6 +43,7 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategyTest {
     private CriteriaSet criteria;
     
     
+    @SuppressWarnings("null")
     @BeforeMethod
     public void setup() {
         
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
index 0369a34..b8120c8 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
@@ -62,7 +62,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class DefaultEncryptionParametersResolverTest {
     
     /** The mock symmetric key e.g. for keywrap.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/RelyingPartySigningParametersResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/RelyingPartySigningParametersResolverTest.java
index 2c8474f..6079efc 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/RelyingPartySigningParametersResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/RelyingPartySigningParametersResolverTest.java
@@ -64,7 +64,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
 /** Tests for RelyingPartyProxySigningParametersResolver.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class RelyingPartySigningParametersResolverTest {
     
     /** A 256 bit client_secret.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ACRClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ACRClaimsValidatorTest.java
index ee1b1ab..bd6c08f 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ACRClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ACRClaimsValidatorTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Tests for the {@link ACRClaimsValidator}.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ACRClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AccessTokenHashValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AccessTokenHashValidatorTest.java
index 56a1c5b..cf7923f 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AccessTokenHashValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AccessTokenHashValidatorTest.java
@@ -30,7 +30,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Tests for the {@link AccessTokenHashValidator}.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class AccessTokenHashValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AudienceClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AudienceClaimsValidatorTest.java
index 008462a..ad615ef 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AudienceClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AudienceClaimsValidatorTest.java
@@ -28,7 +28,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link AudienceClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class AudienceClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationAudienceClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationAudienceClaimsValidatorTest.java
index 4d9d1a0..db68f48 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationAudienceClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationAudienceClaimsValidatorTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link AuthenticationAudienceClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class AuthenticationAudienceClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationTimeClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationTimeClaimsValidatorTest.java
index 99ce7fc..19fd1e5 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationTimeClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/AuthenticationTimeClaimsValidatorTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link AuthenticationTimeClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class AuthenticationTimeClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ChainingJWTClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ChainingJWTClaimsValidatorTest.java
index f30a5ff..673d6a9 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ChainingJWTClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ChainingJWTClaimsValidatorTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link ChainingJWTClaimsValidator} class.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ChainingJWTClaimsValidatorTest extends AbstractClaimsValidatorTest{
     
     /** Validation to check.*/
@@ -42,6 +42,7 @@ public class ChainingJWTClaimsValidatorTest extends AbstractClaimsValidatorTest{
     /** Default set of claims.*/
     private List<ClaimsValidator> validators;
     
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();
@@ -132,14 +133,14 @@ public class ChainingJWTClaimsValidatorTest extends AbstractClaimsValidatorTest{
 
         final ClaimsValidator good = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
             }
         };
         
         final ClaimsValidator bad = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
                 throw new JWTValidationException("failure");
             }
@@ -159,14 +160,14 @@ public class ChainingJWTClaimsValidatorTest extends AbstractClaimsValidatorTest{
 
         final ClaimsValidator good = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
             }
         };
         
         final ClaimsValidator bad = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
                 throw new JWTValidationException("failure");
             }
@@ -187,14 +188,14 @@ public class ChainingJWTClaimsValidatorTest extends AbstractClaimsValidatorTest{
 
         final ClaimsValidator good = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
             }
         };
         
         final ClaimsValidator bad = new AbstractClaimsValidator() {
             @Override
-            protected void doValidate(JWTClaimsSet claims, ProfileRequestContext context)
+            protected void doValidate(final JWTClaimsSet claims, final ProfileRequestContext context)
                     throws JWTValidationException {
                 throw new JWTValidationException("failure");
             }
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExactMatchClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExactMatchClaimsValidatorTest.java
index 20b1ffa..3960e43 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExactMatchClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExactMatchClaimsValidatorTest.java
@@ -23,12 +23,13 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link ExactMatchClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ExactMatchClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
     private ExactMatchClaimsValidator validator;
 
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExpiryClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExpiryClaimsValidatorTest.java
index 3a89fb6..b96236f 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExpiryClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ExpiryClaimsValidatorTest.java
@@ -27,12 +27,13 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link ExpiryClaimsValidatorTest}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ExpiryClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
     private ExpiryClaimsValidator validator;
     
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/IssuedAtClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/IssuedAtClaimsValidatorTest.java
index 7ddf8c9..2e9ec33 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/IssuedAtClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/IssuedAtClaimsValidatorTest.java
@@ -28,7 +28,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link IssuedAtClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class IssuedAtClaimsValidatorTest {
     
     /** The validator to test.*/
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/JWTIdentifierClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/JWTIdentifierClaimsValidatorTest.java
index 6fcb5e9..b69b138 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/JWTIdentifierClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/JWTIdentifierClaimsValidatorTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link JWTIdentifierClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class JWTIdentifierClaimsValidatorTest {
 
     /** The validator to test. */
@@ -40,8 +40,8 @@ public class JWTIdentifierClaimsValidatorTest {
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         validator = new JWTIdentifierClaimsValidator();
-        StorageServiceReplayCache replayCache = new StorageServiceReplayCache();
-        MemoryStorageService storageService = new MemoryStorageService();
+        final StorageServiceReplayCache replayCache = new StorageServiceReplayCache();
+        final MemoryStorageService storageService = new MemoryStorageService();
         storageService.setId("mockId");
         storageService.initialize();
         replayCache.setStorage(storageService);
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/NotBeforeClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/NotBeforeClaimsValidatorTest.java
index 86a833e..8e6d7a5 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/NotBeforeClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/NotBeforeClaimsValidatorTest.java
@@ -27,12 +27,13 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link NotBeforeClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class NotBeforeClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
     private NotBeforeClaimsValidator validator;
     
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ProhibitedClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ProhibitedClaimsValidatorTest.java
index b39a59d..d5b7f9d 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ProhibitedClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/ProhibitedClaimsValidatorTest.java
@@ -25,12 +25,13 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link ProhibitedClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class ProhibitedClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
     private ProhibitedClaimsValidator validator;
     
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/RequiredClaimsValidatorTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/RequiredClaimsValidatorTest.java
index 768e395..0cee207 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/RequiredClaimsValidatorTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jwt/claims/impl/RequiredClaimsValidatorTest.java
@@ -25,12 +25,13 @@ import net.shibboleth.oidc.jwt.claims.JWTValidationException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for the {@link RequiredClaimsValidator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
 public class RequiredClaimsValidatorTest extends AbstractClaimsValidatorTest {
     
     /** The validator to test.*/
     private RequiredClaimsValidator validator;
     
+    @Override
     @BeforeMethod
     public void setup() throws ComponentInitializationException {
         super.setup();

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


More information about the commits mailing list