[java-opensaml] 02/05: IDP-2069 Null Handling Task

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=a3fb2f35e83da0d0f60a267c64e95dcc26a71cff

commit a3fb2f35e83da0d0f60a267c64e95dcc26a71cff
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 19 13:51:33 2023 +0100

    IDP-2069 Null Handling Task
    
    https://shibboleth.atlassian.net/browse/IDP-2069
    
    Supress much of the yellow from opensaml-xmlsec-impl
---
 .../main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java | 6 ++++--
 .../impl/DHWithExplicitKDFKeyAgreementProcessorTest.java         | 2 +-
 .../agreement/impl/DHWithLegacyKDFKeyAgreementProcessorTest.java | 2 +-
 .../xmlsec/agreement/impl/ECDHKeyAgreementProcessorTest.java     | 2 +-
 .../opensaml/xmlsec/agreement/impl/PrivateCredentialTest.java    | 2 +-
 .../opensaml/xmlsec/agreement/tests/KeyAgreementSupportTest.java | 2 +-
 .../opensaml/xmlsec/algorithm/tests/AlgorithmSupportTest.java    | 2 +-
 .../org/opensaml/xmlsec/crypto/tests/XMLSigningUtilTest.java     | 2 +-
 .../java/org/opensaml/xmlsec/derivation/impl/ConcatKDFTest.java  | 2 +-
 .../org/opensaml/xmlsec/derivation/impl/DHLegacyKDFTest.java     | 2 +-
 .../java/org/opensaml/xmlsec/derivation/impl/PBKDF2Test.java     | 2 +-
 .../org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/CipherValueTest.java     | 1 +
 .../org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java   | 1 +
 .../org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java   | 1 +
 .../org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java    | 1 +
 .../opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java    | 1 +
 .../xmlsec/encryption/impl/EncryptionPropertiesTest.java         | 1 +
 .../opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java  | 1 +
 .../org/opensaml/xmlsec/encryption/impl/IterationCountTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java    | 1 +
 .../opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java  | 1 +
 .../org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java    | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java    | 1 +
 .../test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java   | 1 +
 .../org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java   | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java | 1 +
 .../opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java   | 1 +
 .../org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java     | 1 +
 .../org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java    | 1 +
 .../test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java   | 1 +
 .../src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java     | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/PublicTest.java     | 1 +
 .../src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java | 1 +
 .../opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java    | 1 +
 .../org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java   | 1 +
 .../test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java  | 1 +
 .../test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java  | 1 +
 .../java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java | 1 +
 .../org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java | 2 +-
 .../support/tests/ChainingEncryptedKeyResolverTest.java          | 1 +
 .../xmlsec/encryption/support/tests/DHWithExplicitKDFTest.java   | 2 +-
 .../xmlsec/encryption/support/tests/DHWithLegacyKDFTest.java     | 2 +-
 .../encryption/support/tests/DecryptionSignedContentTest.java    | 1 +
 .../support/tests/DefaultPreDecryptionValidatorTest.java         | 2 +-
 .../org/opensaml/xmlsec/encryption/support/tests/ECDHTest.java   | 2 +-
 .../encryption/support/tests/EncryptionClonedContentTest.java    | 2 +-
 .../encryption/support/tests/InlineEncryptedKeyResolverTest.java | 1 +
 .../xmlsec/encryption/support/tests/SimpleDecryptionTest.java    | 1 +
 .../xmlsec/encryption/support/tests/SimpleEncryptionTest.java    | 1 +
 .../xmlsec/impl/AbstractSecurityParametersResolverTest.java      | 2 +-
 .../xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java       | 1 +
 .../xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java      | 2 +-
 .../xmlsec/impl/BasicAlgorithmPolicyConfigurationTest.java       | 9 +++++----
 .../xmlsec/impl/BasicDecryptionParametersResolverTest.java       | 2 +-
 .../opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java   | 2 +-
 .../xmlsec/impl/BasicEncryptionParametersResolverTest.java       | 2 +-
 .../xmlsec/impl/BasicSignatureSigningConfigurationTest.java      | 2 +-
 .../xmlsec/impl/BasicSignatureSigningParametersResolverTest.java | 2 +-
 .../impl/BasicSignatureValidationParametersResolverTest.java     | 2 +-
 .../org/opensaml/xmlsec/keyinfo/impl/AgreementMethodTest.java    | 2 +-
 .../opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java  | 1 +
 .../org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java  | 1 +
 .../keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java      | 1 +
 .../org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java | 1 +
 .../java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java   | 1 +
 .../java/org/opensaml/xmlsec/keyinfo/impl/ECKeyValueTest.java    | 1 +
 .../xmlsec/keyinfo/impl/KeyAgreementKeyInfoGeneratorTest.java    | 2 +-
 .../xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java         | 1 +
 .../xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java  | 2 +-
 .../xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java    | 1 +
 .../java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java   | 1 +
 .../org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java | 1 +
 .../opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java | 1 +
 .../opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java   | 1 +
 .../org/opensaml/xmlsec/keyinfo/tests/KeyInfoSupportTest.java    | 1 +
 .../impl/PopulateSignatureValidationParametersHandlerTest.java   | 2 +-
 .../opensaml/xmlsec/mock/SignableSimpleXMLObjectMarshaller.java  | 1 +
 .../xmlsec/mock/SignableSimpleXMLObjectUnmarshaller.java         | 1 +
 .../opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java   | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java | 1 +
 .../org/opensaml/xmlsec/signature/impl/DigestMethodTest.java     | 2 +-
 .../java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/ExponentTest.java    | 1 +
 .../src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java  | 1 +
 .../src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java  | 1 +
 .../org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java     | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java     | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java    | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java    | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/ModulusTest.java     | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java  | 2 +-
 .../java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java     | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java    | 1 +
 .../org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java     | 1 +
 .../src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java   | 1 +
 .../src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java | 1 +
 .../org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java    | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java    | 1 +
 .../test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java   | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/TransformTest.java   | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/TransformsTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java     | 1 +
 .../org/opensaml/xmlsec/signature/impl/X509CertificateTest.java  | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/X509DataTest.java    | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java  | 2 +-
 .../org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java   | 1 +
 .../org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java | 1 +
 .../java/org/opensaml/xmlsec/signature/impl/X509SKITest.java     | 1 +
 .../org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java | 1 +
 .../org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java  | 1 +
 .../test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java  | 1 +
 .../src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java  | 1 +
 .../signature/support/impl/ChainingSignatureTrustEngineTest.java | 2 +-
 .../support/impl/ExplicitKeySignatureTrustEngineTest.java        | 1 +
 .../signature/support/impl/PKIXSignatureTrustEngineTest.java     | 2 +-
 .../xmlsec/signature/support/tests/DetachedSignatureTest.java    | 2 +-
 .../xmlsec/signature/support/tests/EnvelopedSignatureTest.java   | 1 +
 .../xmlsec/signature/support/tests/HMACSignatureTest.java        | 1 +
 .../xmlsec/signature/support/tests/SignatureSupportTest.java     | 2 +-
 136 files changed, 143 insertions(+), 41 deletions(-)

diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
index c52e3d152..3e62a9e9c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
@@ -257,6 +257,7 @@ public class ConcatKDF extends AbstractInitializableComponent
             try {
                 // We don't store this off for later use b/c these appear to be non-thread-safe, per-use instances,
                 // so we get a new one each time in derive(...).
+                assert digestMethod!=null;
                 getDigestInstance(digestMethod);
             } catch (final KeyDerivationException e) {
                 throw new ComponentInitializationException("Unable to obtain digest instance", e);
@@ -281,7 +282,7 @@ public class ConcatKDF extends AbstractInitializableComponent
                 decodeParam(partyVInfo, "PartyVInfo"),
                 decodeParam(suppPubInfo, "SuppPubInfo"),
                 decodeParam(suppPrivInfo, "SuppPrivInfo"));
-        
+        assert otherInfo!=null;
         final byte[] keyBytes = derive(secret, otherInfo, jcaKeyLength);
     
         return new SecretKeySpec(keyBytes, jcaKeyAlgorithm); 
@@ -307,6 +308,7 @@ public class ConcatKDF extends AbstractInitializableComponent
     protected byte[] derive(@Nonnull final byte[] secret, @Nonnull final byte[] otherInfo,
             @Nonnull final Integer keyLength) throws KeyDerivationException {
         
+        assert digestMethod!=null;
         final Digest digest = getDigestInstance(digestMethod);
         
         final ConcatenationKDFGenerator concatKDF = new ConcatenationKDFGenerator(digest);
@@ -383,7 +385,7 @@ public class ConcatKDF extends AbstractInitializableComponent
         } catch (final DecoderException e) {
             throw new KeyDerivationException("ConcatKDF parameter was not valid hex-encoded value: " + name, e);
         }
-        
+        assert decoded!=null;
         return decoded;
     }
     
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithExplicitKDFKeyAgreementProcessorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithExplicitKDFKeyAgreementProcessorTest.java
index a12fa3bef..cbdb923b6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithExplicitKDFKeyAgreementProcessorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithExplicitKDFKeyAgreementProcessorTest.java
@@ -38,7 +38,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DHWithExplicitKDFKeyAgreementProcessorTest extends OpenSAMLInitBaseTestCase {
     
     private DHWithExplicitKDFKeyAgreementProcessor processor;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithLegacyKDFKeyAgreementProcessorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithLegacyKDFKeyAgreementProcessorTest.java
index fcf8fe233..61a5a904a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithLegacyKDFKeyAgreementProcessorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/DHWithLegacyKDFKeyAgreementProcessorTest.java
@@ -35,7 +35,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DHWithLegacyKDFKeyAgreementProcessorTest extends OpenSAMLInitBaseTestCase {
     
     private DHWithLegacyKDFKeyAgreementProcessor processor;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/ECDHKeyAgreementProcessorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/ECDHKeyAgreementProcessorTest.java
index 8e0e712a6..dc904a467 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/ECDHKeyAgreementProcessorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/ECDHKeyAgreementProcessorTest.java
@@ -39,7 +39,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class ECDHKeyAgreementProcessorTest extends OpenSAMLInitBaseTestCase {
     
     private ECDHKeyAgreementProcessor processor;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/PrivateCredentialTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/PrivateCredentialTest.java
index 4b22a3445..fab225034 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/PrivateCredentialTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/impl/PrivateCredentialTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.shared.logic.ConstraintViolationException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class PrivateCredentialTest extends OpenSAMLInitBaseTestCase  {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/tests/KeyAgreementSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/tests/KeyAgreementSupportTest.java
index dfa269e56..95e4356d3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/tests/KeyAgreementSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/agreement/tests/KeyAgreementSupportTest.java
@@ -38,7 +38,7 @@ import org.opensaml.xmlsec.signature.support.SignatureConstants;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyAgreementSupportTest extends XMLObjectBaseTestCase {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/tests/AlgorithmSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/tests/AlgorithmSupportTest.java
index ff55da5c5..3bb439c32 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/tests/AlgorithmSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/algorithm/tests/AlgorithmSupportTest.java
@@ -73,7 +73,7 @@ import org.testng.annotations.Test;
 /**
  * Unit test for {@link KeySupport}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class AlgorithmSupportTest extends OpenSAMLInitBaseTestCase {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/crypto/tests/XMLSigningUtilTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/crypto/tests/XMLSigningUtilTest.java
index 9a2411d69..c386e5946 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/crypto/tests/XMLSigningUtilTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/crypto/tests/XMLSigningUtilTest.java
@@ -43,7 +43,7 @@ import org.opensaml.xmlsec.signature.support.SignatureConstants;
 /**
  * Test the SigningUtil operations for generating and verifying simple, raw signatures and MAC's.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class XMLSigningUtilTest extends OpenSAMLInitBaseTestCase {
     
     private SecretKey secretKeyAES128;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/ConcatKDFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/ConcatKDFTest.java
index c5c503012..5567dd623 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/ConcatKDFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/ConcatKDFTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class ConcatKDFTest extends XMLObjectBaseTestCase {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDFTest.java
index 66db07792..91fa24349 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDFTest.java
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.shared.codec.Base64Support;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DHLegacyKDFTest extends OpenSAMLInitBaseTestCase {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/PBKDF2Test.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/PBKDF2Test.java
index 7c8fd86be..f20ff6238 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/PBKDF2Test.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/derivation/impl/PBKDF2Test.java
@@ -52,7 +52,7 @@ import net.shibboleth.shared.codec.Base64Support;
 import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class PBKDF2Test extends XMLObjectBaseTestCase {
     
     @Test
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
index 99bb81123..e83fe0131 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodTest.java
@@ -31,6 +31,7 @@ import org.opensaml.xmlsec.encryption.RecipientKeyInfo;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class AgreementMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
index 5624a43e8..463b268bc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.CarriedKeyName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class CarriedKeyNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
index 4d980c0ae..cc7facf46 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherDataTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.encryption.CipherValue;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class CipherDataTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
index b3b9fef32..87493bff8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.encryption.Transforms;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class CipherReferenceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedURI;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
index aa8f439a9..12f68fd48 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.CipherValue;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class CipherValueTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedBase64Content;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
index b0ae0ef85..c3a64d4a8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
@@ -29,6 +29,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ConcatKDFParamsTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedDigestMethod;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
index 69a830280..f3ae82cce 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
@@ -33,6 +33,7 @@ import org.opensaml.xmlsec.encryption.Seed;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DHKeyValueTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
index 8d1d205be..bb461dd56 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.encryption.DataReference;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DataReferenceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedURI;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
index 17f2f1fbe..059b413bd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.DerivedKeyName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DerivedKeyNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
index 936b5888c..f3fd00189 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
@@ -31,6 +31,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedId;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
index e75137ae8..0928e6296 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
@@ -35,6 +35,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedId;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
index 1ac44b0a2..410e52c36 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedId;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
index 4ccadb5af..8c7fa0570 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
@@ -30,6 +30,7 @@ import org.opensaml.xmlsec.encryption.OAEPparams;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
index 47627b354..be0427018 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
@@ -32,6 +32,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
index 32f4c713e..e98c8c41b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedTarget;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
index 3139feaa8..d272ac4ea 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.Generator;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class GeneratorTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
index a57c6c12a..8947f6675 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.IterationCount;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class IterationCountTest extends XMLObjectProviderBaseTestCase {
     
     private Integer expectedIntegerContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
index c7f1f9315..7650a8388 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.KANonce;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KANonceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedBase64Content;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
index 80c0c83d1..04a882c38 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
@@ -28,6 +28,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyDerivationMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
index 69995122a..d0056d197 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.KeyLength;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyLengthTest extends XMLObjectProviderBaseTestCase {
     
     private Integer expectedIntegerContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
index bfc4a6a93..7a63932d2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.encryption.KeyReference;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyReferenceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedURI;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
index 3225563c7..ce41f6009 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.KeySize;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeySizeTest extends XMLObjectProviderBaseTestCase {
     
     private Integer expectedIntegerContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
index b3989833b..42e57f4dc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class MGFTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
index 76d25630c..94bba3322 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.MasterKeyName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class MasterKeyNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
index c0d0ea944..728babf4b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.OAEPparams;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class OAEPparamsTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedBase64Content;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
index c3497a492..c723fcada 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
@@ -35,6 +35,7 @@ import org.opensaml.xmlsec.signature.X509Data;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
index a64855da1..684f140e1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class OtherSourceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
index 563d59b73..71615ee21 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PBKDF2ParamsTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
index 9278b4b41..95bfaa8cc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PRFTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
index d8b93c94c..93cc6f43d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.P;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
index 590a0dc95..05bd817fc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.PgenCounter;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PgenCounterTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
index f61c92c36..e6c5f4949 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.Public;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PublicTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
index bcf9a4571..d44984ecf 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.Q;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class QTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
index 324e0372a..3e2959305 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
@@ -35,6 +35,7 @@ import org.opensaml.xmlsec.signature.X509Data;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
index b7ef5daf9..6234a4367 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
@@ -29,6 +29,7 @@ import org.opensaml.xmlsec.encryption.ReferenceList;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ReferenceListTest extends XMLObjectProviderBaseTestCase {
     
     private int expectedNumDataRefs;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
index 55dfbb953..9d4858fb7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
@@ -28,6 +28,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SaltTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
index b2dd3975a..466bf53ac 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.Seed;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SeedTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
index d8e64841f..b3e21c892 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.Specified;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SpecifiedTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
index 1fa2ea824..e319fa7e4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.Transform;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class TransformsTest extends XMLObjectProviderBaseTestCase {
     
     private int expectedNumTransforms;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
index 3fd6d10e0..2d0b4854d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
@@ -42,7 +42,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class AESGCMTest extends XMLObjectBaseTestCase {
     
     private Logger log = LoggerFactory.getLogger(AESGCMTest.class);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ChainingEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ChainingEncryptedKeyResolverTest.java
index 575e695b9..98b2c7bd2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ChainingEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ChainingEncryptedKeyResolverTest.java
@@ -42,6 +42,7 @@ import org.testng.annotations.Test;
 /**
  * Test the encrypted key resolver which dereferences RetrievalMethods.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ChainingEncryptedKeyResolverTest extends XMLObjectBaseTestCase {
     
     /** The resolver instance to be tested. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithExplicitKDFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithExplicitKDFTest.java
index ef01c213d..9e2d19a0a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithExplicitKDFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithExplicitKDFTest.java
@@ -77,7 +77,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.SerializeSupport;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DHWithExplicitKDFTest extends XMLObjectBaseTestCase {
     
     private String targetFile;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithLegacyKDFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithLegacyKDFTest.java
index 2ac37ffb8..11a5f6cfd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithLegacyKDFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DHWithLegacyKDFTest.java
@@ -78,7 +78,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.SerializeSupport;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DHWithLegacyKDFTest extends XMLObjectBaseTestCase {
     
     private String targetFile;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DecryptionSignedContentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DecryptionSignedContentTest.java
index b761fe5f9..01eeb0a34 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DecryptionSignedContentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DecryptionSignedContentTest.java
@@ -62,6 +62,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Test decryption of signed content.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DecryptionSignedContentTest extends XMLObjectBaseTestCase {
 
     /** Credential used to sign and verify. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DefaultPreDecryptionValidatorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DefaultPreDecryptionValidatorTest.java
index 1dfeaa9f4..2ceccdde9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DefaultPreDecryptionValidatorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/DefaultPreDecryptionValidatorTest.java
@@ -28,7 +28,7 @@ import org.opensaml.xmlsec.encryption.support.PreDecryptionValidationException;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DefaultPreDecryptionValidatorTest extends XMLObjectBaseTestCase {
     
     private DefaultPreDecryptionValidator validator;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ECDHTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ECDHTest.java
index 5d16b5052..0f82ce8d3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ECDHTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/ECDHTest.java
@@ -76,7 +76,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.SerializeSupport;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class ECDHTest extends XMLObjectBaseTestCase {
     
     private String targetFile;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/EncryptionClonedContentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/EncryptionClonedContentTest.java
index d934bfb21..4560e0ed6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/EncryptionClonedContentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/EncryptionClonedContentTest.java
@@ -36,7 +36,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class EncryptionClonedContentTest extends XMLObjectBaseTestCase {
     
     private String targetFile;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/InlineEncryptedKeyResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/InlineEncryptedKeyResolverTest.java
index 3eb7f592d..180be3a15 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/InlineEncryptedKeyResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/InlineEncryptedKeyResolverTest.java
@@ -38,6 +38,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 /**
  * Test the inline encrypted key resolver.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class InlineEncryptedKeyResolverTest extends XMLObjectBaseTestCase {
     
     /** The resolver instance to be tested. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleDecryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleDecryptionTest.java
index ca1dcb01b..abb1e47a4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleDecryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleDecryptionTest.java
@@ -63,6 +63,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Simple tests for decryption.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver keyResolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleEncryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleEncryptionTest.java
index b7c106976..7bd2259a0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleEncryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/SimpleEncryptionTest.java
@@ -60,6 +60,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Simple tests for encryption.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
     
     private Encrypter encrypter;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
index 9b3ef73e9..69ebc61ff 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolverTest.java
@@ -52,7 +52,7 @@ import org.testng.annotations.Test;
  * Test various aspects of the {@link AbstractSecurityParametersResolver} so don't have to test
  * them in all the individual subclasses.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class AbstractSecurityParametersResolverTest extends XMLObjectBaseTestCase {
     
     private DummyParametersResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
index e23f06f73..6a1ec4126 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
@@ -35,6 +35,7 @@ import org.opensaml.xmlsec.AlgorithmPolicyConfiguration;
  * Criterion which holds one or more instances of {@link AlgorithmPolicyConfiguration},
  * used exclusively for testing the {@link AbstractSecurityParametersResolver}.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class AlgorithmPolicyConfigurationCriterion implements Criterion {
     
     /** The list of configuration instances. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
index a6eeae2d9..4224923fd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicateTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class AlgorithmRuntimeSupportedPredicateTest extends OpenSAMLInitBaseTestCase {
     
     private AlgorithmRuntimeSupportedPredicate predicate;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfigurationTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfigurationTest.java
index f9753c18e..5bb67cb5b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfigurationTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfigurationTest.java
@@ -18,7 +18,10 @@
 
 package org.opensaml.xmlsec.impl;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Arrays;
 
@@ -26,9 +29,7 @@ import org.opensaml.xmlsec.AlgorithmPolicyConfiguration.Precedence;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import net.shibboleth.shared.logic.ConstraintViolationException;
-
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicAlgorithmPolicyConfigurationTest {
     
     private BasicAlgorithmPolicyConfiguration config;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolverTest.java
index bff6b8a43..cdc803ab2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolverTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicDecryptionParametersResolverTest {
     
     private BasicDecryptionParametersResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
index 967157fb1..702c9e49f 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicEncryptionConfigurationTest {
     
     private BasicEncryptionConfiguration config;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
index a98cc5289..d59b854e3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolverTest.java
@@ -66,7 +66,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicEncryptionParametersResolverTest extends XMLObjectBaseTestCase {
     
     private BasicEncryptionParametersResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfigurationTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfigurationTest.java
index 883a43e1c..5aa2d2af6 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfigurationTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfigurationTest.java
@@ -33,7 +33,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicSignatureSigningConfigurationTest {
     
     private BasicSignatureSigningConfiguration config;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
index 5b2a622e9..15660a5fa 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.java
@@ -49,7 +49,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicSignatureSigningParametersResolverTest extends XMLObjectBaseTestCase {
     
     private BasicSignatureSigningParametersResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolverTest.java
index c4a18f78f..67c7352a1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolverTest.java
@@ -40,7 +40,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicSignatureValidationParametersResolverTest {
     
     private BasicSignatureValidationParametersResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/AgreementMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/AgreementMethodTest.java
index af1a704e9..0bef53cc1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/AgreementMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/AgreementMethodTest.java
@@ -65,7 +65,7 @@ import com.google.common.collect.Iterables;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class AgreementMethodTest extends XMLObjectBaseTestCase {
     
     private LocalKeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
index 27a8e8087..a85a7caf9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
@@ -39,6 +39,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 /**
  * Tests the factory and impl for BasicKeyInfoGenerator.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
     
     private BasicCredential credential;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
index ca9a5f6e1..a924342eb 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/CertChainX509DataTest.java
@@ -50,6 +50,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
  * where the X509Data contains various identifiers for the entity cert
  * within a cert chain.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class CertChainX509DataTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
index 60b9443de..17924496d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
@@ -37,6 +37,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
+ at SuppressWarnings({"javadoc", "null"})
 public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase {
     
     private ChainingKeyInfoCredentialResolver chainingResolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
index 9365b5fa0..7fba6fc17 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DEREncodedKeyValueTest.java
@@ -41,6 +41,7 @@ import net.shibboleth.shared.resolver.ResolverException;
 /**
  * Test resolution of credentials from DEREncodedKeyValue child of KeyInfo.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DEREncodedKeyValueTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
index 7a3e17962..17511117d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/DSAKeyValueTest.java
@@ -42,6 +42,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 /**
  * Test resolution of credentials from RSAKeyValue child of KeyInfo.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DSAKeyValueTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ECKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ECKeyValueTest.java
index 068367a86..0363701bf 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ECKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ECKeyValueTest.java
@@ -41,6 +41,7 @@ import net.shibboleth.shared.resolver.ResolverException;
 /**
  * Test resolution of credentials from RSAKeyValue child of KeyInfo.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ECKeyValueTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyAgreementKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyAgreementKeyInfoGeneratorTest.java
index 24c6c6380..d6ba11167 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyAgreementKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyAgreementKeyInfoGeneratorTest.java
@@ -59,7 +59,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyAgreementKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
     
     private KeyPair keyPairOriginatorECDH, keyPairRecipientECDH;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
index ec9e193cd..97969a46e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
@@ -39,6 +39,7 @@ import org.opensaml.xmlsec.keyinfo.KeyInfoGeneratorManager;
 /**
  * Test the KeyInfoGeneratorFactory manager.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyInfoGeneratorManagerTest extends XMLObjectBaseTestCase {
     
     private KeyInfoGeneratorManager manager;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
index 82bc22b09..97445e59e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolverTest.java
@@ -44,7 +44,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 /**
  * Test the local credential resolver specialization of the KeyInfo credential resolver.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class LocalKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase {
     
     private String keyName;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
index 1ebdd5516..b2f6bb80e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
@@ -38,6 +38,7 @@ import org.opensaml.xmlsec.keyinfo.NamedKeyInfoGeneratorManager;
 /**
  * Test the NamedKeyInfoGeneratorFactory manager.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class NamedKeyInfoGeneratorManagerTest extends XMLObjectBaseTestCase {
     private NamedKeyInfoGeneratorManager manager;
     
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
index fe11a4386..7cb41b69c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/RSAKeyValueTest.java
@@ -42,6 +42,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 /**
  * Test resolution of credentials from RSAKeyValue child of KeyInfo.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class RSAKeyValueTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
index 54e56f440..429d6e593 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/SingleCertX509DataTest.java
@@ -45,6 +45,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
  * Test resolution of credentials from X509Data child of KeyInfo,
  * where the X509Data contains a single certificate.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SingleCertX509DataTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver resolver;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
index fb5f25de7..b02913b90 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Element;
 /**
  * Test the static KeyInfo generator.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class StaticKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
     
     private StaticKeyInfoGenerator generator;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
index 15080fb26..64823b916 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
@@ -62,6 +62,7 @@ import org.opensaml.xmlsec.signature.support.SignatureConstants;
 /**
  * Tests the factory and impl for X509KeyInfoGenerator.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
 
     private static String subjectAltNameExtensionOID = "2.5.29.17";
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/tests/KeyInfoSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/tests/KeyInfoSupportTest.java
index 470877dac..954e1e17e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/tests/KeyInfoSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/tests/KeyInfoSupportTest.java
@@ -88,6 +88,7 @@ import net.shibboleth.shared.logic.Constraint;
  * Test to exercise the KeyInfoSupport methods to convert between XMLObject's contained within KeyInfo and Java security
  * native types.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
 
     /** Cert which contains no X.509 v3 extensions. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
index eba48bd4e..db8986f25 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandlerTest.java
@@ -38,7 +38,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 
 /** Unit test for {@link PopulateSignatureValidationParametersHandler}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class PopulateSignatureValidationParametersHandlerTest extends OpenSAMLInitBaseTestCase {
 
     private MessageContext messageContext;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectMarshaller.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectMarshaller.java
index f72a24f2f..a56b96442 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectMarshaller.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectMarshaller.java
@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
 /**
  * Marshaller for {@link org.opensaml.core.xml.mock.SimpleXMLObject} objects.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SignableSimpleXMLObjectMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectUnmarshaller.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectUnmarshaller.java
index cc9fdb41c..7ba11485f 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObjectUnmarshaller.java
@@ -33,6 +33,7 @@ import org.w3c.dom.Attr;
 /**
  * Unmarshaller for {@link org.opensaml.core.xml.mock.SimpleXMLObject}.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SignableSimpleXMLObjectUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
index 02d95a858..2adb060e2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
@@ -31,6 +31,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DEREncodedKeyValueTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
index 1f0feb337..4cea8a60b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
@@ -33,6 +33,7 @@ import org.opensaml.xmlsec.signature.Y;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class DSAKeyValueTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
index 406aca265..40bd19d52 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
@@ -25,7 +25,7 @@ import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
 import org.opensaml.core.xml.mock.SimpleXMLObject;
 import org.opensaml.xmlsec.signature.DigestMethod;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
index 360b41403..8c08ce10c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
@@ -33,6 +33,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
 
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
index 48553dcba..99fe98174 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.Exponent;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ExponentTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
index f98aa7af4..49b3fe0d3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.G;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class GTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
index 827ccc7b5..9bb3d5658 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.J;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class JTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
index 0008cf665..ab8ba7f4c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
@@ -31,6 +31,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyInfoReferenceTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
index ecf0613a2..c877a0097 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedID;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
index eaec9c1f1..b55b0f17d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.KeyName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
index 37804a563..2a171de45 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.RSAKeyValue;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class KeyValueTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
index 67c05267b..74a239dc8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.MgmtData;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class MgmtDataTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
index d22902a49..5a8e4ca4c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.Modulus;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ModulusTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
index a5f2dae5f..83e7b1886 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
@@ -24,7 +24,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class NamedCurveTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedURI;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
index 78c5d11ad..b4900e505 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
@@ -29,6 +29,7 @@ import org.opensaml.xmlsec.signature.PGPKeyPacket;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PGPDataTest extends XMLObjectProviderBaseTestCase {
     
     
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
index a133ab178..1fd2a1a4b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.PGPKeyID;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PGPKeyIDTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
index 569a7c5e0..e21f832fd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.PGPKeyPacket;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PGPKeyPacketTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
index 2b8f1fe0b..e833653fd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.P;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
index 03ad8b055..cb081ed45 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.PgenCounter;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PgenCounterTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
index c0db0bc4a..e9d147450 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class PublicKeyTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
index a10a19aee..82be71ef0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.Q;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class QTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
index 5201b5893..d75187140 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.RSAKeyValue;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class RSAKeyValueTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
index c8606bcce..071434586 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.Transforms;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedURI;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
index f86de10a1..31ba96b6a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.SPKISexp;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SPKIDataTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
index 260b91fd8..7a29c7acd 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.SPKISexp;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SPKISexpTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
index c1cd0ec4d..62fce6eb9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.Seed;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class SeedTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
index 6fd56438d..cec1c0d77 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
@@ -29,6 +29,7 @@ import org.opensaml.xmlsec.signature.XPath;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class TransformTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
index 5b38f101d..5a6f4aa75 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.Transforms;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class TransformsTest extends XMLObjectProviderBaseTestCase {
     
     private int expectedNumTransforms;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
index 86277a7b8..4452d8b70 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.X509CRL;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509CRLTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
index 352c424cf..f0b763b20 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.X509Certificate;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509CertificateTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
index f61a4eff8..fe6ffc27b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
@@ -32,6 +32,7 @@ import org.opensaml.xmlsec.signature.X509SubjectName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509DataTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
index 6a3137afe..8a69b3f38 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
@@ -25,7 +25,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class X509DigestTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
index 0b65807c0..5665f1dc4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.X509IssuerName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509IssuerNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
index e5b2cf18d..94906215d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
@@ -28,6 +28,7 @@ import org.opensaml.xmlsec.signature.X509SerialNumber;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509IssuerSerialTest extends XMLObjectProviderBaseTestCase {
     
     /**
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
index bf529a5ac..8b42eeff4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.X509SKI;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509SKITest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
index 27496b057..54d44091d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
@@ -29,6 +29,7 @@ import org.opensaml.xmlsec.signature.X509SerialNumber;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509SerialNumberTest extends XMLObjectProviderBaseTestCase {
     
     private BigInteger expectedBigIntegerContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
index b705b41a9..f41e2ad05 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.X509SubjectName;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class X509SubjectNameTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
index caf8b79e3..46a4dfcf2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.XPath;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class XPathTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedStringContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
index 4f7611b54..ef50a6051 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.signature.Y;
 /**
  *
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class YTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedCryptoBinaryContent;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
index ec4ea1761..64d64123c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngineTest.java
@@ -36,7 +36,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class ChainingSignatureTrustEngineTest extends XMLObjectBaseTestCase {
 
     private CriteriaSet criteriaSet;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
index e7f918555..e4942e87c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
@@ -56,6 +56,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 /**
  * Test explicit key signature trust engine.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
     
     private X509Certificate signingCert;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
index 364223082..6eb92d6dc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
@@ -72,7 +72,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
 /**
  * Tests the {@link PKIXSignatureTrustEngine} implementation.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class PKIXSignatureTrustEngineTest extends XMLObjectBaseTestCase {
     
     private static final String DATA_PATH = "/org/opensaml/xmlsec/signature/support/";
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
index 1e134f117..bbcda475d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
@@ -55,7 +55,7 @@ import net.shibboleth.shared.testing.RepositorySupport;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.impl.BasicParserPool;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class DetachedSignatureTest extends XMLObjectBaseTestCase {
 
     /** Class logger. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/EnvelopedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/EnvelopedSignatureTest.java
index b58bf74b5..f269ba31e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/EnvelopedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/EnvelopedSignatureTest.java
@@ -59,6 +59,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Test to verify {@link org.opensaml.xmlsec.signature.Signature} and its marshallers and unmarshallers.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class EnvelopedSignatureTest extends XMLObjectBaseTestCase {
 
     /** Class logger. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
index 4521142d7..517f2c8ea 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
@@ -64,6 +64,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Test to verify {@link org.opensaml.xmlsec.signature.Signature} and its marshallers and unmarshallers.
  */
+ at SuppressWarnings({"javadoc", "null"})
 public class HMACSignatureTest extends XMLObjectBaseTestCase {
 
     /** Class logger. */
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/SignatureSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/SignatureSupportTest.java
index 45e9370d6..f6c33de40 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/SignatureSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/SignatureSupportTest.java
@@ -39,7 +39,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"javadoc", "null"})
 public class SignatureSupportTest extends XMLObjectBaseTestCase {
     
     private Credential signingCredential;

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