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

Rod Widdowson rdw at steadingsoftware.com
Thu Apr 20 14:00:23 UTC 2023


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=cbb26206969bdb4238e385d1ac2bd3127dd344f8

commit cbb26206969bdb4238e385d1ac2bd3127dd344f8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Apr 20 14:00:10 2023 +0100

    IDP-2069 Null Handling Task
    
    https://shibboleth.atlassian.net/browse/IDP-2069
    
    Remove all red (and a lot of yellow) from opensaml-saml-impl tests
---
 .../impl/AddInResponseToToResponseTest.java        |  2 +-
 .../AddNotBeforeConditionToAssertionsTest.java     |  1 +
 .../AddNotOnOrAfterConditionToAssertionsTest.java  |  1 +
 .../PopulateSignatureSigningParametersTest.java    |  2 +-
 .../common/profile/impl/SignAssertionsTest.java    |  2 +-
 .../profile/impl/VerifyChannelBindingsTest.java    |  2 +-
 .../AbstractSubjectConfirmationValidatorTest.java  |  2 +-
 .../AudienceRestrictionConditionValidatorTest.java |  3 +-
 .../impl/AuthnStatementValidatorTest.java          |  2 +-
 .../BearerSubjectConfirmationValidatorTest.java    |  2 +-
 ...elegationRestrictionConditionValidatorTest.java |  2 +-
 ...olderOfKeySubjectConfirmationValidatorTest.java |  2 +-
 .../impl/OneTimeUseConditionValidatorTest.java     |  2 +-
 .../ProxyRestrictionConditionValidatorTest.java    |  2 +-
 ...derVouchesSubjectConfirmationValidatorTest.java |  2 +-
 .../opensaml/saml/saml2/core/impl/AdviceTest.java  |  5 +-
 .../saml/saml2/core/impl/ArtifactResolveTest.java  |  9 +--
 .../saml/saml2/core/impl/ArtifactResponseTest.java |  1 +
 .../saml/saml2/core/impl/ArtifactTest.java         |  7 ++-
 .../saml/saml2/core/impl/AssertionIDRefTest.java   | 11 ++--
 .../saml2/core/impl/AssertionIDRequestTest.java    | 20 ++++---
 .../saml/saml2/core/impl/AssertionTest.java        | 45 +++++++--------
 .../saml/saml2/core/impl/AssertionURIRefTest.java  |  3 +-
 .../saml/saml2/core/impl/AttributeQueryTest.java   |  2 +
 .../saml2/core/impl/AttributeStatementTest.java    | 10 ++--
 .../saml/saml2/core/impl/AttributeTest.java        | 23 ++++----
 .../saml2/core/impl/AudienceRestrictionTest.java   | 16 +++---
 .../saml/saml2/core/impl/AudienceTest.java         | 10 ++--
 .../core/impl/AuthenticatingAuthorityTest.java     | 11 ++--
 .../saml2/core/impl/AuthnContextClassRefTest.java  | 10 ++--
 .../saml2/core/impl/AuthnContextDeclRefTest.java   | 10 ++--
 .../saml/saml2/core/impl/AuthnContextDeclTest.java |  9 +--
 .../saml/saml2/core/impl/AuthnContextTest.java     |  3 +-
 .../saml/saml2/core/impl/AuthnQueryTest.java       | 29 +++++-----
 .../saml/saml2/core/impl/AuthnRequestTest.java     | 35 ++++++++----
 .../saml/saml2/core/impl/AuthnStatementTest.java   | 20 ++++---
 .../saml2/core/impl/AuthzDecisionQueryTest.java    | 28 ++++-----
 .../core/impl/AuthzDecisionStatementTest.java      | 26 +++++----
 .../saml/saml2/core/impl/ConditionsTest.java       | 10 +++-
 .../saml2/core/impl/EncryptedAssertionTest.java    | 11 ++--
 .../saml2/core/impl/EncryptedAttributeTest.java    | 11 ++--
 .../saml/saml2/core/impl/EncryptedIDTest.java      | 10 ++--
 .../saml/saml2/core/impl/EvidenceTest.java         |  7 ++-
 .../saml/saml2/core/impl/ExtensionsTest.java       |  3 +-
 .../saml/saml2/core/impl/GetCompleteTest.java      |  7 ++-
 .../saml/saml2/core/impl/IDPEntryTest.java         | 13 +++--
 .../opensaml/saml/saml2/core/impl/IDPListTest.java | 17 +++---
 .../opensaml/saml/saml2/core/impl/IssuerTest.java  | 11 ++--
 .../core/impl/KeyInfoConfirmationDataTypeTest.java | 21 +++----
 .../saml/saml2/core/impl/LogoutRequestTest.java    |  6 +-
 .../saml/saml2/core/impl/LogoutResponseTest.java   | 19 ++++---
 .../saml2/core/impl/ManageNameIDRequestTest.java   |  4 +-
 .../saml2/core/impl/ManageNameIDResponseTest.java  |  1 +
 .../saml2/core/impl/NameIDMappingRequestTest.java  |  3 +-
 .../saml2/core/impl/NameIDMappingResponseTest.java |  2 +
 .../saml/saml2/core/impl/NameIDPolicyTest.java     | 11 +++-
 .../opensaml/saml/saml2/core/impl/NameIDTest.java  | 19 ++++---
 .../saml/saml2/core/impl/NewEncryptedIDTest.java   |  5 +-
 .../opensaml/saml/saml2/core/impl/NewIDTest.java   |  9 +--
 .../saml/saml2/core/impl/OneTimeUseTest.java       |  1 +
 .../saml/saml2/core/impl/ProxyRestrictionTest.java | 21 ++++---
 .../saml/saml2/core/impl/RequestTestBase.java      | 20 ++++---
 .../saml2/core/impl/RequestedAuthnContextTest.java | 24 ++++----
 .../saml/saml2/core/impl/RequesterIDTest.java      |  7 ++-
 .../saml/saml2/core/impl/ResponseTest.java         | 21 +++----
 .../opensaml/saml/saml2/core/impl/ScopingTest.java | 23 ++++----
 .../saml/saml2/core/impl/SessionIndexTest.java     | 13 +++--
 .../saml/saml2/core/impl/StatusCodeTest.java       | 15 ++---
 .../saml/saml2/core/impl/StatusDetailTest.java     | 14 ++---
 .../saml/saml2/core/impl/StatusMessageTest.java    |  8 ++-
 .../saml2/core/impl/StatusResponseTestBase.java    | 23 +++++---
 .../opensaml/saml/saml2/core/impl/StatusTest.java  | 18 +++---
 .../core/impl/SubjectConfirmationDataTest.java     | 28 ++++-----
 .../saml2/core/impl/SubjectConfirmationTest.java   | 37 ++++++------
 .../saml/saml2/core/impl/SubjectLocalityTest.java  | 18 +++---
 .../opensaml/saml/saml2/core/impl/SubjectTest.java | 18 +++---
 .../saml/saml2/core/impl/TerminateTest.java        |  1 +
 .../encryption/tests/ComplexEncryptionTest.java    |  1 +
 .../tests/DecryptionPlusSigningTest.java           |  3 +-
 .../saml/saml2/encryption/tests/ECDHTest.java      |  2 +-
 .../encryption/tests/SimpleDecryptionTest.java     | 15 ++---
 .../encryption/tests/SimpleEncryptionTest.java     |  1 +
 .../tests/XMLSecurityTestingSupport.java           |  1 +
 .../impl/AdditionalMetadataLocationTest.java       | 10 ++--
 .../saml2/metadata/impl/AffiliateMemberTest.java   | 11 ++--
 .../metadata/impl/AffiliationDescriptorTest.java   | 49 ++++++++--------
 .../impl/ArtifactResolutionServiceTest.java        | 37 ++----------
 .../impl/AssertionConsumerServiceTest.java         | 19 ++++---
 .../impl/AssertionIDRequestServiceTest.java        |  4 +-
 .../impl/AttributeAuthorityDescriptorTest.java     |  5 +-
 .../impl/AttributeConsumingServiceTest.java        | 15 +++--
 .../saml2/metadata/impl/AttributeProfileTest.java  |  3 +-
 .../saml2/metadata/impl/AttributeServiceTest.java  | 15 ++---
 .../impl/AuthnAuthorityDescriptorTest.java         | 49 ++++++++--------
 .../saml2/metadata/impl/AuthnQueryServiceTest.java | 13 +++--
 .../saml/saml2/metadata/impl/AuthzServiceTest.java |  5 +-
 .../saml/saml2/metadata/impl/CompanyTest.java      |  7 ++-
 .../saml2/metadata/impl/ContactPersonTest.java     | 30 +++++-----
 .../saml/saml2/metadata/impl/EmailAddressTest.java |  5 +-
 .../saml2/metadata/impl/EncryptionMethodTest.java  | 14 ++---
 .../metadata/impl/EntitiesDescriptorTest.java      | 27 ++++-----
 .../saml2/metadata/impl/EntityDescriptorTest.java  | 64 +++++++++++----------
 .../saml/saml2/metadata/impl/ExtensionsTest.java   | 11 ++--
 .../saml/saml2/metadata/impl/GivenNameTest.java    |  7 ++-
 .../saml2/metadata/impl/IDPSSODescriptorTest.java  | 66 ++++++++++++----------
 .../saml2/metadata/impl/KeyDescriptorTest.java     | 18 +++---
 .../metadata/impl/ManageNameIDServiceTest.java     | 13 +++--
 .../saml/saml2/metadata/impl/NameIDFormatTest.java |  7 ++-
 .../metadata/impl/NameIDMappingServiceTest.java    | 13 +++--
 .../metadata/impl/OrganizationDisplayNameTest.java |  7 ++-
 .../saml2/metadata/impl/OrganizationNameTest.java  | 11 ++--
 .../saml/saml2/metadata/impl/OrganizationTest.java | 21 ++++---
 .../saml2/metadata/impl/OrganizationURLTest.java   |  9 +--
 .../saml2/metadata/impl/PDPDescriptorTest.java     | 31 +++++-----
 .../metadata/impl/RequestedAttributeTest.java      | 58 +++++++++++--------
 .../saml2/metadata/impl/SPSSODescriptorTest.java   | 58 ++++++++++---------
 .../metadata/impl/ServiceDescriptionTest.java      |  4 +-
 .../saml/saml2/metadata/impl/ServiceNameTest.java  |  4 +-
 .../metadata/impl/SingleLogoutServiceTest.java     | 24 ++++----
 .../metadata/impl/SingleSignOnServiceTest.java     |  4 +-
 .../saml/saml2/metadata/impl/SurNameTest.java      |  7 ++-
 .../saml2/metadata/impl/TelephoneNumberTest.java   |  7 ++-
 .../saml/saml2/metadata/tests/MetadataTest.java    |  1 +
 .../impl/AbstractSAML2NameIDGeneratorTest.java     |  2 +-
 .../impl/AddChannelBindingsToAssertionsTest.java   |  1 +
 .../impl/AddGeneratedKeyToAssertionsTest.java      |  1 +
 .../profile/impl/AddNameIDToSubjectsTest.java      |  2 +-
 .../AddOneTimeUseConditionToAssertionsTest.java    |  1 +
 .../profile/impl/AddStatusToResponseTest.java      |  2 +-
 .../impl/AddSubjectConfirmationToSubjectsTest.java |  2 +-
 .../profile/impl/CopyNameIDFromRequestTest.java    |  2 +-
 .../saml2/profile/impl/DecryptNameIDsTest.java     |  1 +
 .../saml2/profile/impl/EncryptAssertionsTest.java  |  2 +-
 .../saml2/profile/impl/EncryptAttributesTest.java  |  2 +-
 .../saml2/profile/impl/EncryptNameIDsTest.java     |  2 +-
 .../MockAssertionValidationContextBuilder.java     |  1 +
 .../saml2/profile/impl/PopulateECPContextTest.java |  2 +-
 .../saml2/profile/impl/ResolveArtifactTest.java    |  2 +-
 .../saml2/profile/impl/TestSelfEncryption.java     |  2 +-
 .../saml2/profile/impl/ValidateAssertionsTest.java |  2 +-
 ...AML20AssertionValidationContextBuilderTest.java |  2 +-
 ...itySAML20AssertionTokenSecurityHandlerTest.java |  2 +-
 ...InlineSelfEncryptionParametersStrategyTest.java |  2 +-
 .../impl/MetadataCredentialResolverTest.java       |  1 +
 ...MLMetadataEncryptionParametersResolverTest.java |  2 +-
 ...dataSignatureSigningParametersResolverTest.java |  2 +-
 146 files changed, 942 insertions(+), 766 deletions(-)

diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
index 6889a7ee3..a0969a0a6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link AddInResponseToToResponse} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AddInResponseToToResponseTest extends OpenSAMLInitBaseTestCase {
 
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
index c24ea8d86..a53a5c182 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertionsTest.java
@@ -36,6 +36,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link AddNotBeforeConditionToAssertions} unit test. */
+ at SuppressWarnings({"null", "javadoc"})
 public class AddNotBeforeConditionToAssertionsTest  extends OpenSAMLInitBaseTestCase {
 
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
index 02cbb10eb..a9a1d69ff 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
@@ -40,6 +40,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link AddNotOnOrAfterConditionToAssertions} unit test. */
+ at SuppressWarnings({"null", "javadoc"})
 public class AddNotOnOrAfterConditionToAssertionsTest  extends OpenSAMLInitBaseTestCase {
 
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
index 9a25fc3ef..065335367 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParametersTest.java
@@ -42,7 +42,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** Unit test for {@link PopulateSignatureSigningParameters}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class PopulateSignatureSigningParametersTest extends OpenSAMLInitBaseTestCase {
 
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
index 71ae59871..8071a19c5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/SignAssertionsTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link SignAssertions} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class SignAssertionsTest extends OpenSAMLInitBaseTestCase {
 
     private SignAssertions action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
index 32cd95999..b33dd33b9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link VerifyChannelBindings} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class VerifyChannelBindingsTest extends OpenSAMLInitBaseTestCase {
     
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
index d68c1fd97..3dfe3af27 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidatorTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.shared.logic.Constraint;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AbstractSubjectConfirmationValidatorTest extends BaseAssertionValidationTest {
     
     private MockSubjectConfirmationValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
index ee53b8320..fa88f7716 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidatorTest.java
@@ -32,8 +32,7 @@ import org.opensaml.saml.saml2.core.OneTimeUse;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AudienceRestrictionConditionValidatorTest extends BaseAssertionValidationTest {
     
     private String expectedAudienceURI = "https://sp.example.com";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
index aeb49d0a1..11b85732e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidatorTest.java
@@ -40,7 +40,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.shared.logic.Constraint;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnStatementValidatorTest extends BaseAssertionValidationTest {
     
     private AuthnStatementValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
index 14788905c..e2bce8fc3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/BearerSubjectConfirmationValidatorTest.java
@@ -26,7 +26,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class BearerSubjectConfirmationValidatorTest extends BaseAssertionValidationTest {
     
     private BearerSubjectConfirmationValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
index a417b157c..dc8b5fbdd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/DelegationRestrictionConditionValidatorTest.java
@@ -28,7 +28,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class DelegationRestrictionConditionValidatorTest extends BaseAssertionValidationTest {
     
     private DelegationRestrictionConditionValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
index 49a145e93..b4098d587 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidatorTest.java
@@ -44,7 +44,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.shared.codec.EncodingException;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class HolderOfKeySubjectConfirmationValidatorTest extends BaseAssertionValidationTest {
     
     private HolderOfKeySubjectConfirmationValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
index 0770e5726..5bcd642d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
@@ -42,7 +42,7 @@ import org.testng.annotations.Test;
 /**
  * Unit test for {@link OneTimeUseConditionValidator}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class OneTimeUseConditionValidatorTest extends BaseAssertionValidationTest {
     
     private MemoryStorageService storageService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
index 6d650222a..2898d7d51 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/ProxyRestrictionConditionValidatorTest.java
@@ -28,7 +28,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class ProxyRestrictionConditionValidatorTest extends BaseAssertionValidationTest {
     
     private ProxyRestrictionConditionValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
index 2e5bbeb5d..035866770 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/SenderVouchesSubjectConfirmationValidatorTest.java
@@ -26,7 +26,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class SenderVouchesSubjectConfirmationValidatorTest extends BaseAssertionValidationTest {
 
     private SenderVouchersSubjectConfirmationValidator validator;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
index 05e552182..5f5f9a372 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AdviceTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.EncryptedAssertion;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AdviceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AdviceTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of AssertionIDRef subelements */
@@ -60,8 +61,8 @@ public class AdviceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Advice advice = (Advice) unmarshallElement(childElementsFile);
-
+        final Advice advice = (Advice) unmarshallElement(childElementsFile);
+        assert advice != null;
         Assert.assertEquals(advice.getAssertionIDReferences()
                 .size(), assertionIDRefCount, "AssertionIDRef count not as expected");
         Assert.assertEquals(advice.getAssertionURIReferences()
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveTest.java
index 7db8ee25e..43aea48a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ArtifactResolveTest extends RequestTestBase {
 
     /**
@@ -72,7 +73,7 @@ public class ArtifactResolveTest extends RequestTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(ArtifactResolve.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(ArtifactResolve.DEFAULT_ELEMENT_NAME);
 
         ((ArtifactResolve)target).setID("id123");
 
@@ -82,7 +83,7 @@ public class ArtifactResolveTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, ArtifactResolve.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, ArtifactResolve.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         ArtifactResolve ar = (ArtifactResolve) buildXMLObject(qname);
         
         super.populateRequiredAttributes(ar);
@@ -128,8 +129,8 @@ public class ArtifactResolveTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        ArtifactResolve ar = (ArtifactResolve) unmarshallElement(childElementsFile);
-        
+        final ArtifactResolve ar = (ArtifactResolve) unmarshallElement(childElementsFile);
+        assert ar != null;
         Assert.assertNotNull(ar.getArtifact(), "Artifact was null");
         super.helperTestChildElementsUnmarshall(ar);
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseTest.java
index de07d1653..fcc340383 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ArtifactResponseTest extends StatusResponseTestBase {
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
index b458b4387..4e0b8d2a2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ArtifactTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Artifact;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ArtifactTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected element content*/
@@ -50,15 +51,15 @@ public class ArtifactTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Artifact artifact = (Artifact) unmarshallElement(singleElementFile);
-        
+        final Artifact artifact = (Artifact) unmarshallElement(singleElementFile);
+        assert artifact != null;
         Assert.assertEquals(artifact.getValue(), expectedContent, "Artifact content is not the expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        Artifact artifact = (Artifact) buildXMLObject(Artifact.DEFAULT_ELEMENT_NAME);
+        final Artifact artifact = (Artifact) buildXMLObject(Artifact.DEFAULT_ELEMENT_NAME);
         
         artifact.setValue(expectedContent);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
index 99ce423b2..db83697e7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AssertionIDRef;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AssertionIDRefImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionIDRefTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected AssertionID value */
@@ -47,9 +48,9 @@ public class AssertionIDRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AssertionIDRef assertionIDRef = (AssertionIDRef) unmarshallElement(singleElementFile);
-
-        String assertionID = assertionIDRef.getValue();
+        final AssertionIDRef assertionIDRef = (AssertionIDRef) unmarshallElement(singleElementFile);
+        assert assertionIDRef!= null;
+        final String assertionID = assertionIDRef.getValue();
         Assert.assertEquals(assertionID, expectedAssertionID,
                 "AssertionID was " + assertionID + ", expected " + expectedAssertionID);
     }
@@ -63,8 +64,8 @@ public class AssertionIDRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AssertionIDRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AssertionIDRef assertionIDRef = (AssertionIDRef) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AssertionIDRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AssertionIDRef assertionIDRef = (AssertionIDRef) buildXMLObject(qname);
 
         assertionIDRef.setValue(expectedAssertionID);
         assertXMLEquals(expectedDOM, assertionIDRef);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestTest.java
index 59d6a7d87..b6bf92d13 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionIDRequestTest extends RequestTestBase {
     
     private int expectedNumAssertionIDRefs;
@@ -78,7 +79,7 @@ public class AssertionIDRequestTest extends RequestTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(AssertionIDRequest.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(AssertionIDRequest.DEFAULT_ELEMENT_NAME);
 
         ((AssertionIDRequest)target).setID("id123");
 
@@ -88,8 +89,8 @@ public class AssertionIDRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AssertionIDRequest.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AssertionIDRequest req = (AssertionIDRequest) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AssertionIDRequest.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AssertionIDRequest req = (AssertionIDRequest) buildXMLObject(qname);
         
         super.populateRequiredAttributes(req);
         super.populateOptionalAttributes(req);
@@ -101,8 +102,9 @@ public class AssertionIDRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        AssertionIDRequestBuilder builder = (AssertionIDRequestBuilder) builderFactory.getBuilder(AssertionIDRequest.DEFAULT_ELEMENT_NAME);
-        AssertionIDRequest req = builder.buildObject();
+        final AssertionIDRequestBuilder builder = (AssertionIDRequestBuilder) builderFactory.getBuilder(AssertionIDRequest.DEFAULT_ELEMENT_NAME);
+        assert builder!= null;
+        final AssertionIDRequest req = builder.buildObject();
         
         super.populateChildElements(req);
         
@@ -116,7 +118,7 @@ public class AssertionIDRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(singleElementFile);
+        final AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(singleElementFile);
         
         super.helperTestSingleElementUnmarshall(req);
     }
@@ -124,7 +126,7 @@ public class AssertionIDRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(singleElementOptionalAttributesFile);
+        final AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(singleElementOptionalAttributesFile);
         
         super.helperTestSingleElementOptionalAttributesUnmarshall(req);
     }
@@ -132,8 +134,8 @@ public class AssertionIDRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(childElementsFile);
-        
+        final AssertionIDRequest req = (AssertionIDRequest) unmarshallElement(childElementsFile);
+        assert req != null;       
         super.helperTestChildElementsUnmarshall(req);
         Assert.assertEquals(req.getAssertionIDRefs().size(), expectedNumAssertionIDRefs, "AssertionIDRef count");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
index 9b7b8d7cb..286d9d7aa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionTest.java
@@ -44,6 +44,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AssertionImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Version value */
@@ -84,9 +85,9 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Assertion assertion = (Assertion) unmarshallElement(singleElementFile);
-
-        Instant notBefore = assertion.getIssueInstant();
+        final Assertion assertion = (Assertion) unmarshallElement(singleElementFile);
+        assert assertion != null;
+        final Instant notBefore = assertion.getIssueInstant();
         Assert.assertEquals(notBefore, expectedIssueInstant,
                 "IssueInstant was " + notBefore + ", expected " + expectedIssueInstant);
     }
@@ -94,13 +95,13 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        Assertion assertion = (Assertion) unmarshallElement(singleElementOptionalAttributesFile);
-
-        Instant issueInstant = assertion.getIssueInstant();
+        final Assertion assertion = (Assertion) unmarshallElement(singleElementOptionalAttributesFile);
+        assert assertion != null;
+        final Instant issueInstant = assertion.getIssueInstant();
         Assert.assertEquals(issueInstant, expectedIssueInstant,
                 "IssueInstant was " + issueInstant + ", expected " + expectedIssueInstant);
 
-        String id = assertion.getID();
+        final String id = assertion.getID();
         Assert.assertEquals(id, expectedID, "ID was " + id + ", expected " + expectedID);
         
         SAMLVersion version = assertion.getVersion();
@@ -110,8 +111,8 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Assertion assertion = (Assertion) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Assertion assertion = (Assertion) buildXMLObject(qname);
 
         assertion.setIssueInstant(expectedIssueInstant);
 
@@ -126,7 +127,7 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(Assertion.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(Assertion.DEFAULT_ELEMENT_NAME);
 
         ((Assertion)target).setID("id123");
 
@@ -136,8 +137,8 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Assertion assertion = (Assertion) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Assertion assertion = (Assertion) buildXMLObject(qname);
 
         assertion.setIssueInstant(expectedIssueInstant);
         assertion.setID(expectedID);
@@ -149,8 +150,8 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Assertion assertion = (Assertion) unmarshallElement(childElementsFile);
-
+        final Assertion assertion = (Assertion) unmarshallElement(childElementsFile);
+        assert assertion != null;
         Assert.assertNotNull(assertion.getIssuer(), "Issuer element not present");
         Assert.assertNotNull(assertion.getSubject(), "Subject element not present");
         Assert.assertNotNull(assertion.getConditions(), "Conditions element not present");
@@ -166,19 +167,19 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Assertion assertion = (Assertion) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Assertion assertion = (Assertion) buildXMLObject(qname);
 
-        QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         assertion.setIssuer((Issuer) buildXMLObject(issuerQName));
         
-        QName subjectQName = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName subjectQName = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         assertion.setSubject((Subject) buildXMLObject(subjectQName));
         
-        QName conditionsQName = new QName(SAMLConstants.SAML20_NS, Conditions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName conditionsQName = new QName(SAMLConstants.SAML20_NS, Conditions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         assertion.setConditions((Conditions) buildXMLObject(conditionsQName));
         
-        QName adviceQName = new QName(SAMLConstants.SAML20_NS, Advice.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName adviceQName = new QName(SAMLConstants.SAML20_NS, Advice.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         assertion.setAdvice((Advice) buildXMLObject(adviceQName));
 
         QName authnStatementQName = new QName(SAMLConstants.SAML20_NS, AuthnStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
@@ -186,12 +187,12 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
             assertion.getAuthnStatements().add((AuthnStatement) buildXMLObject(authnStatementQName));
         }
         
-        QName authzDecisionStatementQName = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName authzDecisionStatementQName = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < authzDecisionStatementCount; i++) {
             assertion.getAuthzDecisionStatements().add((AuthzDecisionStatement) buildXMLObject(authzDecisionStatementQName));
         }
         
-        QName attributeStatementQName = new QName(SAMLConstants.SAML20_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName attributeStatementQName = new QName(SAMLConstants.SAML20_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < attributeStatementCount; i++) {
             assertion.getAttributeStatements().add((AttributeStatement) buildXMLObject(attributeStatementQName));
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
index 93312093f..a7d1e2e68 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AssertionURIRef;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AssertionURIRefImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionURIRefTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Assertion URI value */
@@ -48,7 +49,7 @@ public class AssertionURIRefTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall() {
         AssertionURIRef assertionURIRef = (AssertionURIRef) unmarshallElement(singleElementFile);
-
+        assert assertionURIRef!=null;
         String assertionURI = assertionURIRef.getURI();
         Assert.assertEquals(assertionURI, expectedAssertionURI,
                 "AssertionURI was " + assertionURI + ", expected " + expectedAssertionURI);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeQueryTest.java
index 68e873b9d..e930cc783 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeQueryTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeQueryTest extends SubjectQueryTestBase {
     
     /** Expected number of Attribute child elements */
@@ -142,6 +143,7 @@ public class AttributeQueryTest extends SubjectQueryTestBase {
     public void testChildElementsUnmarshall() {
         AttributeQuery query = (AttributeQuery) unmarshallElement(childElementsFile);
         
+        assert query!=null;
         Assert.assertEquals(query.getAttributes().size(), expectedNumAttributes, "Attribute count");
         super.helperTestChildElementsUnmarshall(query);
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
index bf94a52e9..1fa754a9e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeStatementTest.java
@@ -27,6 +27,7 @@ import org.opensaml.saml.saml2.core.EncryptedAttribute;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AttributeStatementImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of Attribute subelements. */
@@ -45,7 +46,7 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(singleElementFile);
+        final AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(singleElementFile);
 
         Assert.assertNotNull(attributeStatement);
     }
@@ -53,7 +54,8 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(childElementsFile);
+        final AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(childElementsFile);
+        assert attributeStatement!=null;
         Assert.assertEquals(attributeStatement.getAttributes().size(), expectedAttributeCount, "Attribute Count");
         Assert.assertEquals(attributeStatement.getEncryptedAttributes().size(), 
                 expectedEncryptedAttributeCount, "EncryptedAttribute Count");
@@ -63,7 +65,7 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        AttributeStatement attributeStatement = 
+        final AttributeStatement attributeStatement = 
             (AttributeStatement) buildXMLObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
 
         assertXMLEquals(expectedDOM, attributeStatement);
@@ -72,7 +74,7 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        AttributeStatement attributeStatement = 
+        final AttributeStatement attributeStatement = 
             (AttributeStatement) buildXMLObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
 
         attributeStatement.getAttributes()
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
index 22ea6a6a3..2dc29862a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AttributeTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Attribute;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AttributeImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Name attribute value */
@@ -58,9 +59,10 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Attribute attribute = (Attribute) unmarshallElement(singleElementFile);
+        final Attribute attribute = (Attribute) unmarshallElement(singleElementFile);
+        assert attribute!=null;
 
-        String name = attribute.getName();
+        final String name = attribute.getName();
         Assert.assertEquals(name, expectedName, "Name was " + name + ", expected " + expectedName);
 
     }
@@ -68,16 +70,17 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        Attribute attribute = (Attribute) unmarshallElement(singleElementOptionalAttributesFile);
+        final Attribute attribute = (Attribute) unmarshallElement(singleElementOptionalAttributesFile);
+        assert attribute!=null;
 
-        String name = attribute.getName();
+        final String name = attribute.getName();
         Assert.assertEquals(name, expectedName, "Name was " + name + ", expected " + expectedName);
 
-        String nameFormat = attribute.getNameFormat();
+        final String nameFormat = attribute.getNameFormat();
         Assert.assertEquals(nameFormat, expectedNameFormat,
                 "NameFormat was " + nameFormat + ", expected " + expectedNameFormat);
 
-        String friendlyName = attribute.getFriendlyName();
+        final String friendlyName = attribute.getFriendlyName();
         Assert.assertEquals(friendlyName, expectedFriendlyName,
                 "FriendlyName was " + friendlyName + ", expected " + expectedFriendlyName);
     }
@@ -85,8 +88,8 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Attribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Attribute attribute = (Attribute) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Attribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Attribute attribute = (Attribute) buildXMLObject(qname);
 
         attribute.setName(expectedName);
 
@@ -96,8 +99,8 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Attribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Attribute attribute = (Attribute) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Attribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Attribute attribute = (Attribute) buildXMLObject(qname);
 
         attribute.setName(expectedName);
         attribute.setNameFormat(expectedNameFormat);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
index 658d3d5cd..89b180fc5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AudienceRestriction;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AudienceRestrictionImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AudienceRestrictionTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of Audience subelements */
@@ -43,7 +44,7 @@ public class AudienceRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AudienceRestriction audienceRestriction = (AudienceRestriction) unmarshallElement(singleElementFile);
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) unmarshallElement(singleElementFile);
 
         Assert.assertNotNull(audienceRestriction);
     }
@@ -57,8 +58,8 @@ public class AudienceRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AudienceRestriction audienceRestriction = (AudienceRestriction) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) buildXMLObject(qname);
 
         assertXMLEquals(expectedDOM, audienceRestriction);
     }
@@ -72,17 +73,18 @@ public class AudienceRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AudienceRestriction audienceRestriction = (AudienceRestriction) unmarshallElement(childElementsFile);
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) unmarshallElement(childElementsFile);
+        assert audienceRestriction!=null;
         Assert.assertEquals(audienceRestriction.getAudiences().size(), expectedAudienceCount, "Audience Count");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AudienceRestriction audienceRestriction = (AudienceRestriction) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) buildXMLObject(qname);
 
-        QName audienceQName = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName audienceQName = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < expectedAudienceCount; i++) {
             audienceRestriction.getAudiences().add((Audience) buildXMLObject(audienceQName));
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
index 8e119b9ee..322033e0d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AudienceTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Audience;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AudienceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AudienceTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Audience URI value */
@@ -47,9 +48,10 @@ public class AudienceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Audience audience = (Audience) unmarshallElement(singleElementFile);
+        final Audience audience = (Audience) unmarshallElement(singleElementFile);
+        assert audience !=null;
 
-        String audienceURI = audience.getURI();
+        final String audienceURI = audience.getURI();
         Assert.assertEquals(audienceURI, expectedAudienceURI,
                 "AssertionURI was " + audienceURI + ", expected " + expectedAudienceURI);
     }
@@ -63,8 +65,8 @@ public class AudienceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Audience audience = (Audience) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Audience audience = (Audience) buildXMLObject(qname);
 
         audience.setURI(expectedAudienceURI);
         assertXMLEquals(expectedDOM, audience);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
index a2a37ecb4..fad313a74 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.AuthenticatingAuthorityImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthenticatingAuthorityTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected URI value */
@@ -48,9 +49,9 @@ public class AuthenticatingAuthorityTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) unmarshallElement(singleElementFile);
-
-        String assertionURI = authenticatingAuthority.getURI();
+        final AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) unmarshallElement(singleElementFile);
+        assert authenticatingAuthority !=null;
+        final String assertionURI = authenticatingAuthority.getURI();
         Assert.assertEquals(assertionURI, expectedURI, "URI was " + assertionURI + ", expected " + expectedURI);
     }
 
@@ -63,9 +64,9 @@ public class AuthenticatingAuthorityTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthenticatingAuthority.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthenticatingAuthority.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) buildXMLObject(qname);
+        final AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) buildXMLObject(qname);
 
         authenticatingAuthority.setURI(expectedURI);
         assertXMLEquals(expectedDOM, authenticatingAuthority);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
index 7591e8a86..7f5acf71f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AuthnContextClassRef;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AuthnContextClassRefImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnContextClassRefTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Class Reference value */
@@ -47,9 +48,10 @@ public class AuthnContextClassRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) unmarshallElement(singleElementFile);
+        final AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) unmarshallElement(singleElementFile);
+        assert authnContextClassRef !=null;
 
-        String classRef = authnContextClassRef.getURI();
+        final String classRef = authnContextClassRef.getURI();
         Assert.assertEquals(classRef, expectedClassRef, "Class Reference was " + classRef + ", expected " + expectedClassRef);
     }
 
@@ -62,8 +64,8 @@ public class AuthnContextClassRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextClassRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextClassRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) buildXMLObject(qname);
 
         authnContextClassRef.setURI(expectedClassRef);
         assertXMLEquals(expectedDOM, authnContextClassRef);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
index 9128e26c5..23b35b0cd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AuthnContextDeclRefImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnContextDeclRefTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Declaration Reference value */
@@ -47,9 +48,10 @@ public class AuthnContextDeclRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) unmarshallElement(singleElementFile);
+        final AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) unmarshallElement(singleElementFile);
+        assert authnContextDeclRef !=null;
 
-        String declRef = authnContextDeclRef.getURI();
+        final String declRef = authnContextDeclRef.getURI();
         Assert.assertEquals(declRef, expectedDeclRef, "Declartion Reference was " + declRef + ", expected " + expectedDeclRef);
     }
 
@@ -62,8 +64,8 @@ public class AuthnContextDeclRefTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextDeclRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextDeclRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) buildXMLObject(qname);
 
         authnContextDeclRef.setURI(expectedDeclRef);
         assertXMLEquals(expectedDOM, authnContextDeclRef);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
index db5e56f7c..6e5bc44f9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.AuthnContextDecl;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AuthnContextDeclImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnContextDeclTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Declaration value. */
@@ -47,8 +48,8 @@ public class AuthnContextDeclTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthnContextDecl authnContextDecl = (AuthnContextDecl) unmarshallElement(singleElementFile);
-
+        final AuthnContextDecl authnContextDecl = (AuthnContextDecl) unmarshallElement(singleElementFile);
+        assert authnContextDecl !=null;
         String declaration = authnContextDecl.getTextContent();
         Assert.assertEquals(declaration, expectedDeclartion,
                 "Declartion was " + declaration + ", expected " + expectedDeclartion);
@@ -63,9 +64,9 @@ public class AuthnContextDeclTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextDecl.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthnContextDecl.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        AuthnContextDecl authnContextDecl = (AuthnContextDecl) buildXMLObject(qname);
+        final AuthnContextDecl authnContextDecl = (AuthnContextDecl) buildXMLObject(qname);
 
         authnContextDecl.setTextContent(expectedDeclartion);
         assertXMLEquals(expectedDOM, authnContextDecl);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
index 7111bc078..7335abcb0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnContextTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.Test;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AuthnContextImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnContextTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of AuthenticatingAuthority subelements */
@@ -76,7 +77,7 @@ public class AuthnContextTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testChildElementsUnmarshall() {
         AuthnContext authnContext = (AuthnContext) unmarshallElement(childElementsFile);
-
+        assert authnContext!=null;
         Assert.assertNotNull(authnContext.getAuthnContextClassRef(), "AuthnContextClassRef element not present");
         Assert.assertNotNull(authnContext.getAuthContextDecl(), "AuthnContextDecl element not present");
         Assert.assertNotNull(authnContext.getAuthnContextDeclRef(), "AuthnContextDeclRef element not present");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnQueryTest.java
index 33cafd159..26bf46497 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnQueryTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnQueryTest extends SubjectQueryTestBase {
     
     /** Expected SessionIndex attribute value */
@@ -63,8 +64,8 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
         
         super.populateRequiredAttributes(query);
         
@@ -79,7 +80,7 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(AuthnQuery.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(AuthnQuery.DEFAULT_ELEMENT_NAME);
 
         ((AuthnQuery)target).setID("id123");
 
@@ -89,8 +90,8 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
         
         super.populateRequiredAttributes(query);
         super.populateOptionalAttributes(query);
@@ -102,12 +103,12 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthnQuery query = (AuthnQuery) buildXMLObject(qname);
         
         super.populateChildElements(query);
         
-        QName requestedAuthnContextQName = new QName(SAMLConstants.SAML20P_NS, RequestedAuthnContext.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName requestedAuthnContextQName = new QName(SAMLConstants.SAML20P_NS, RequestedAuthnContext.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         query.setRequestedAuthnContext((RequestedAuthnContext) buildXMLObject(requestedAuthnContextQName));
         
         assertXMLEquals(expectedChildElementsDOM, query);
@@ -117,8 +118,8 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthnQuery query = (AuthnQuery) unmarshallElement(singleElementFile);
-        
+        final  AuthnQuery query = (AuthnQuery) unmarshallElement(singleElementFile);
+        assert query!=null;
         Assert.assertNotNull(query, "AuthnQuery");
         Assert.assertNull(query.getSessionIndex(), "SessionIndex");
         super.helperTestSingleElementUnmarshall(query);
@@ -128,8 +129,8 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthnQuery query = (AuthnQuery) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final AuthnQuery query = (AuthnQuery) unmarshallElement(singleElementOptionalAttributesFile);
+        assert query!=null;
         super.helperTestSingleElementOptionalAttributesUnmarshall(query);
         Assert.assertEquals(query.getSessionIndex(), expectedSessionIndex, "Unmarshalled SessionIndex was not the expected value");
     }
@@ -137,8 +138,8 @@ public class AuthnQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AuthnQuery query = (AuthnQuery) unmarshallElement(childElementsFile);
-        
+        final AuthnQuery query = (AuthnQuery) unmarshallElement(childElementsFile);
+        assert query!=null;
         super.helperTestChildElementsUnmarshall(query);
         Assert.assertNotNull(query.getRequestedAuthnContext(), "RequestedAuthnContext");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnRequestTest.java
index 19a674dd6..e28de8e29 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnRequestTest.java
@@ -42,6 +42,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Unit test for {@link AuthnRequest}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnRequestTest extends RequestTestBase {
     
             
@@ -111,7 +112,7 @@ public class AuthnRequestTest extends RequestTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
 
         ((AuthnRequest)target).setID("id123");
 
@@ -121,8 +122,8 @@ public class AuthnRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnRequest.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthnRequest req = (AuthnRequest) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthnRequest.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthnRequest req = (AuthnRequest) buildXMLObject(qname);
         
         super.populateRequiredAttributes(req);
         super.populateOptionalAttributes(req);
@@ -168,8 +169,7 @@ public class AuthnRequestTest extends RequestTestBase {
     @Test
     public void testSingleElementUnmarshall() {
         AuthnRequest req = (AuthnRequest) unmarshallElement(singleElementFile);
-        
-        Assert.assertNotNull(req, "AuthnRequest was null");
+        assert req != null;
         Assert.assertEquals(req.isForceAuthn(), Boolean.FALSE, "ForceAuthn (empty) was not default value");
         Assert.assertEquals(req.isPassive(), Boolean.FALSE, "IsPassive (empty) was not default value");
         Assert.assertNull(req.getProtocolBinding(), "ProtocolBinding was not null");
@@ -185,7 +185,8 @@ public class AuthnRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthnRequest req = (AuthnRequest) unmarshallElement(singleElementOptionalAttributesFile);
+        final AuthnRequest req = (AuthnRequest) unmarshallElement(singleElementOptionalAttributesFile);
+        assert req != null;
         
         Assert.assertEquals(req.isForceAuthnXSBoolean(), expectedForceAuthn, "Unmarshalled ForceAuthn was not the expected value");
         Assert.assertEquals(req.isPassiveXSBoolean(), expectedIsPassive, "Unmarshalled IsPassive was not the expected value");
@@ -201,7 +202,8 @@ public class AuthnRequestTest extends RequestTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AuthnRequest req = (AuthnRequest) unmarshallElement(childElementsFile);
+        final AuthnRequest req = (AuthnRequest) unmarshallElement(childElementsFile);
+        assert req != null;
         
         Assert.assertNotNull(req.getSubject(), "Subject was null");
         Assert.assertNotNull(req.getNameIDPolicy(), "NameIDPolicy was null");
@@ -217,7 +219,8 @@ public class AuthnRequestTest extends RequestTestBase {
      */
     @Test
     public void testXSBooleanAttributes() {
-        AuthnRequest req = (AuthnRequest) buildXMLObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
+        final AuthnRequest req = (AuthnRequest) buildXMLObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
+        assert req != null;
         
         // ForceAuthn attribute
         req.setForceAuthn(Boolean.TRUE);
@@ -225,14 +228,18 @@ public class AuthnRequestTest extends RequestTestBase {
         Assert.assertNotNull(req.isForceAuthnXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(req.isForceAuthnXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(req.isForceAuthnXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool = req.isForceAuthnXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         req.setForceAuthn(Boolean.FALSE);
         Assert.assertEquals(req.isForceAuthn(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(req.isForceAuthnXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(req.isForceAuthnXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(req.isForceAuthnXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool = req.isForceAuthnXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool .toString(), "false", "XSBooleanValue string was unexpected value");
         
         req.setForceAuthn((Boolean) null);
         Assert.assertEquals(req.isForceAuthn(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
@@ -245,14 +252,18 @@ public class AuthnRequestTest extends RequestTestBase {
         Assert.assertNotNull(req.isPassiveXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(req.isPassiveXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(req.isPassiveXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        bool = req.isPassiveXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         req.setIsPassive(Boolean.FALSE);
         Assert.assertEquals(req.isPassive(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(req.isPassiveXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(req.isPassiveXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(req.isPassiveXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool =  req.isPassiveXSBoolean(); 
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
         
         req.setIsPassive((Boolean) null);
         Assert.assertEquals(req.isPassive(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
index e41846876..6eefa9ca8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthnStatementTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.core.SubjectLocality;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.AuthnStatementImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected AuthnInstant value */
@@ -60,8 +61,9 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall() {
         AuthnStatement authnStatement = (AuthnStatement) unmarshallElement(singleElementFile);
+        assert authnStatement != null;
 
-        Instant authnInstant = authnStatement.getAuthnInstant();
+        final Instant authnInstant = authnStatement.getAuthnInstant();
         Assert.assertEquals(authnInstant, expectedAuthnInstant,
                 "AuthnInstant was " + authnInstant + ", expected " + expectedAuthnInstant);
     }
@@ -70,16 +72,17 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         AuthnStatement authnStatement = (AuthnStatement) unmarshallElement(singleElementOptionalAttributesFile);
+        assert authnStatement != null;
 
-        Instant authnInstant = authnStatement.getAuthnInstant();
+        final Instant authnInstant = authnStatement.getAuthnInstant();
         Assert.assertEquals(authnInstant, expectedAuthnInstant,
                 "AuthnInstant was " + authnInstant + ", expected " + expectedAuthnInstant);
 
-        String sessionIndex = authnStatement.getSessionIndex();
+        final String sessionIndex = authnStatement.getSessionIndex();
         Assert.assertEquals(sessionIndex, expectedSessionIndex,
                 "SessionIndex was " + sessionIndex + ", expected " + expectedSessionIndex);
 
-        Instant sessionNotOnOrAfter = authnStatement.getSessionNotOnOrAfter();
+        final Instant sessionNotOnOrAfter = authnStatement.getSessionNotOnOrAfter();
         Assert.assertEquals(sessionNotOnOrAfter,
                 expectedSessionNotOnOrAfter, "SessionNotOnOrAfter was " + sessionNotOnOrAfter + ", expected " + expectedSessionNotOnOrAfter);
     }
@@ -87,7 +90,7 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
+        final AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
 
         authnStatement.setAuthnInstant(expectedAuthnInstant);
         assertXMLEquals(expectedDOM, authnStatement);
@@ -96,7 +99,7 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
+        final AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
 
         authnStatement.setAuthnInstant(expectedAuthnInstant);
         authnStatement.setSessionIndex(expectedSessionIndex);
@@ -108,7 +111,8 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AuthnStatement authnStatement = (AuthnStatement) unmarshallElement(childElementsFile);
+        final AuthnStatement authnStatement = (AuthnStatement) unmarshallElement(childElementsFile);
+        assert authnStatement != null;
         Assert.assertNotNull(authnStatement.getAuthnContext(), "AuthnContext element not present");
         Assert.assertNotNull(authnStatement.getSubjectLocality(), "SubjectLocality element not present");
     }
@@ -116,7 +120,7 @@ public class AuthnStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
+        final AuthnStatement authnStatement = (AuthnStatement) buildXMLObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
 
         authnStatement.setSubjectLocality((SubjectLocality) buildXMLObject(SubjectLocality.DEFAULT_ELEMENT_NAME));
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryTest.java
index 348e6ced0..e704ae10c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     
     /** Expected Resource attribute value */
@@ -67,8 +68,8 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
         
         super.populateRequiredAttributes(query);
         query.setResource(expectedResource);
@@ -84,7 +85,7 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(AuthzDecisionQuery.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(AuthzDecisionQuery.DEFAULT_ELEMENT_NAME);
 
         ((AuthzDecisionQuery)target).setID("id123");
 
@@ -95,8 +96,8 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
         
         super.populateRequiredAttributes(query);
         super.populateOptionalAttributes(query);
@@ -110,17 +111,17 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, AuthzDecisionQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) buildXMLObject(qname);
         
         super.populateChildElements(query);
         
-        QName actionQName = new QName(SAMLConstants.SAML20_NS, Action.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName actionQName = new QName(SAMLConstants.SAML20_NS, Action.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i=0; i<expectedNumActions; i++){
             query.getActions().add((Action) buildXMLObject(actionQName));
         }
         
-        QName evidenceQName = new QName(SAMLConstants.SAML20_NS, Evidence.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName evidenceQName = new QName(SAMLConstants.SAML20_NS, Evidence.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         query.setEvidence((Evidence) buildXMLObject(evidenceQName));
         
         assertXMLEquals(expectedChildElementsDOM, query);
@@ -129,9 +130,9 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(singleElementFile);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(singleElementFile);
         
-        Assert.assertNotNull(query, "AuthzDecisionQuery was null");
+        assert query != null;
         Assert.assertEquals(query.getResource(), expectedResource, "Unmarshalled Resource attribute was not the expected value");
         super.helperTestSingleElementUnmarshall(query);
 
@@ -140,7 +141,7 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(singleElementOptionalAttributesFile);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(singleElementOptionalAttributesFile);
         
         super.helperTestSingleElementOptionalAttributesUnmarshall(query);
     }
@@ -148,7 +149,8 @@ public class AuthzDecisionQueryTest extends SubjectQueryTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(childElementsFile);
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) unmarshallElement(childElementsFile);
+        assert query != null;
         
         Assert.assertEquals(query.getActions().size(), expectedNumActions, "Action count");
         Assert.assertNotNull(query.getEvidence(), "Evidence was null");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
index bacc67e5c..abce5258b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.AuthzDecisionStatementImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Resource value */
@@ -69,7 +70,8 @@ public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(singleElementFile);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(singleElementFile);
+        assert authzDecisionStatement != null;
 
         String resource = authzDecisionStatement.getResource();
         Assert.assertEquals(resource, expectedResource, "Resource not as expected");
@@ -78,20 +80,23 @@ public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(singleElementOptionalAttributesFile);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(singleElementOptionalAttributesFile);
+        assert authzDecisionStatement != null;
 
         String resource = authzDecisionStatement.getResource();
         Assert.assertEquals(resource, expectedResource, "Resource not as expected");
 
-        DecisionTypeEnumeration decision = authzDecisionStatement.getDecision();
+        final DecisionTypeEnumeration decision = authzDecisionStatement.getDecision();
+        assert decision != null;
+
         Assert.assertEquals(decision.toString(), expectedDecision.toString(), "Decision not as expected");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
 
         authzDecisionStatement.setResource(expectedResource);
         assertXMLEquals(expectedDOM, authzDecisionStatement);
@@ -100,8 +105,8 @@ public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
 
         authzDecisionStatement.setResource(expectedResource);
         authzDecisionStatement.setDecision(expectedDecision);
@@ -112,7 +117,8 @@ public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(childElementsFile);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) unmarshallElement(childElementsFile);
+        assert authzDecisionStatement != null;
         Assert.assertEquals(authzDecisionStatement.getActions().size(), expectedActionCount, "Action Count");
         Assert.assertNotNull(authzDecisionStatement.getEvidence(), "Evidence element not present");
     }
@@ -120,8 +126,8 @@ public class AuthzDecisionStatementTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final AuthzDecisionStatement authzDecisionStatement = (AuthzDecisionStatement) buildXMLObject(qname);
 
         QName actionQName = new QName(SAMLConstants.SAML20_NS, Action.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < expectedActionCount; i++) {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
index d7152ebc0..273190c3d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ConditionsTest.java
@@ -36,6 +36,7 @@ import org.opensaml.saml.saml2.core.ProxyRestriction;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.ConditionsImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ConditionsTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected NotBefore value */
@@ -66,7 +67,8 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Conditions conditions = (Conditions) unmarshallElement(singleElementFile);
+        final Conditions conditions = (Conditions) unmarshallElement(singleElementFile);
+        assert conditions !=null;
 
         Instant notBefore = conditions.getNotBefore();
         Assert.assertEquals(notBefore, expectedNotBefore, "NotBefore was " + notBefore + ", expected " + expectedNotBefore);
@@ -75,7 +77,8 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        Conditions conditions = (Conditions) unmarshallElement(singleElementOptionalAttributesFile);
+        final Conditions conditions = (Conditions) unmarshallElement(singleElementOptionalAttributesFile);
+        assert conditions !=null;
 
         Instant notBefore = conditions.getNotBefore();
         Assert.assertEquals(notBefore, expectedNotBefore, "NotBefore was " + notBefore + ", expected " + expectedNotBefore);
@@ -89,7 +92,7 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementMarshall() {
         QName qname = new QName(SAMLConstants.SAML20_NS, Conditions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Conditions conditions = (Conditions) buildXMLObject(qname);
+        final Conditions conditions = (Conditions) buildXMLObject(qname);
 
         conditions.setNotBefore(expectedNotBefore);
         assertXMLEquals(expectedDOM, conditions);
@@ -111,6 +114,7 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testChildElementsUnmarshall() {
         Conditions conditions = (Conditions) unmarshallElement(childElementsFile);
+        assert conditions !=null;
         Assert.assertEquals(conditions.getConditions().size(), conditionCount, "Condition count not as expected");
         Assert.assertNotNull(conditions.getOneTimeUse(), "OneTimeUse absent");
         Assert.assertNotNull(conditions.getProxyRestriction(), "ProxyRestriction absent");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
index 5cccdd649..e8ad57327 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.EncryptedAssertionImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptedAssertionTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of EncryptedKey subelements. */
@@ -41,9 +42,8 @@ public class EncryptedAssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EncryptedAssertion encElement = (EncryptedAssertion) unmarshallElement(singleElementFile);
-
-        Assert.assertNotNull(encElement);
+        final EncryptedAssertion encElement = (EncryptedAssertion) unmarshallElement(singleElementFile);
+        assert encElement!=null;
         Assert.assertNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), 0, "# of EncryptedKey children");
     }
@@ -51,9 +51,8 @@ public class EncryptedAssertionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        EncryptedAssertion encElement = (EncryptedAssertion) unmarshallElement(childElementsFile);
-        
-        Assert.assertNotNull(encElement, "EncryptedAssertion was null");
+        final EncryptedAssertion encElement = (EncryptedAssertion) unmarshallElement(childElementsFile);
+        assert encElement!=null;
         Assert.assertNotNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), encryptedKeyCount, "# of EncryptedKey children");
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
index 69e179668..cbc1ad04a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.EncryptedAttributeImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptedAttributeTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of EncryptedKey subelements. */
@@ -41,9 +42,8 @@ public class EncryptedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EncryptedAttribute encElement = (EncryptedAttribute) unmarshallElement(singleElementFile);
-
-        Assert.assertNotNull(encElement);
+        final EncryptedAttribute encElement = (EncryptedAttribute) unmarshallElement(singleElementFile);
+        assert encElement!=null;
         Assert.assertNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), 0, "# of EncryptedKey children");
     }
@@ -51,9 +51,8 @@ public class EncryptedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        EncryptedAttribute encElement = (EncryptedAttribute) unmarshallElement(childElementsFile);
-        
-        Assert.assertNotNull(encElement, "EncryptedAttribute was null");
+        final EncryptedAttribute encElement = (EncryptedAttribute) unmarshallElement(childElementsFile);
+        assert encElement!=null;
         Assert.assertNotNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), encryptedKeyCount, "# of EncryptedKey children");
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
index 287d6e99c..9f593d1df 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EncryptedIDTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.EncryptedIDImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptedIDTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of EncryptedKey subelements. */
@@ -41,9 +42,9 @@ public class EncryptedIDTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EncryptedID encElement = (EncryptedID) unmarshallElement(singleElementFile);
+        final EncryptedID encElement = (EncryptedID) unmarshallElement(singleElementFile);
 
-        Assert.assertNotNull(encElement);
+        assert encElement!=null;
         Assert.assertNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), 0, "# of EncryptedKey children");
     }
@@ -51,9 +52,8 @@ public class EncryptedIDTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        EncryptedID encElement = (EncryptedID) unmarshallElement(childElementsFile);
-        
-        Assert.assertNotNull(encElement, "EncryptedID was null");
+        final EncryptedID encElement = (EncryptedID) unmarshallElement(childElementsFile);
+        assert encElement!=null;
         Assert.assertNotNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), encryptedKeyCount, "# of EncryptedKey children");
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
index f8f26bac7..94614d748 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/EvidenceTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Evidence;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.EvidenceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EvidenceTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of AssertionIDRef subelements. */
@@ -61,8 +62,8 @@ public class EvidenceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Evidence evidence = (Evidence) unmarshallElement(childElementsFile);
-
+        final Evidence evidence = (Evidence) unmarshallElement(childElementsFile);
+        assert evidence!=null;
         Assert.assertEquals(evidence.getAssertionIDReferences()
                 .size(), assertionIDRefCount, "AssertionIDRef count not as expected");
         Assert.assertEquals(evidence
@@ -83,7 +84,7 @@ public class EvidenceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        Evidence evidence = (Evidence) buildXMLObject(Evidence.DEFAULT_ELEMENT_NAME);
+        final Evidence evidence = (Evidence) buildXMLObject(Evidence.DEFAULT_ELEMENT_NAME);
         
         evidence.getAssertionIDReferences()
             .add((AssertionIDRef) buildXMLObject(AssertionIDRef.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
index 17e5cb151..258e8b4d7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ExtensionsTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.core.Extensions;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.ExtensionsImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
 
     /**
@@ -78,7 +79,7 @@ public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
     public void testChildElementsUnmarshall() {
         Extensions extensions = (Extensions) unmarshallElement(childElementsFile);
         
-        Assert.assertNotNull(extensions);
+        assert extensions!=null;
         Assert.assertEquals(extensions.getUnknownXMLObjects().size(), 3);
     }
     
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
index cf746b8c7..6570be021 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/GetCompleteTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.core.GetComplete;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.GetCompleteImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class GetCompleteTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected element content*/
@@ -52,8 +53,8 @@ public class GetCompleteTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        GetComplete gc = (GetComplete) unmarshallElement(singleElementFile);
-        
+       final GetComplete gc = (GetComplete) unmarshallElement(singleElementFile);
+       assert gc!=null; 
        Assert.assertEquals(gc.getURI(), expectedGetComplete, "Unmarshalled GetComplete URI was not the expected value"); 
 
     }
@@ -61,7 +62,7 @@ public class GetCompleteTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        GetComplete gc = (GetComplete) buildXMLObject(GetComplete.DEFAULT_ELEMENT_NAME);
+        final GetComplete gc = (GetComplete) buildXMLObject(GetComplete.DEFAULT_ELEMENT_NAME);
 
         gc.setURI(expectedGetComplete);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
index ec05fb4b3..263be13f1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPEntryTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.core.IDPEntry;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.IDPEntryImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class IDPEntryTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected ProviderID */
@@ -61,7 +62,7 @@ public class IDPEntryTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        IDPEntry entry = (IDPEntry) buildXMLObject(IDPEntry.DEFAULT_ELEMENT_NAME);
+        final IDPEntry entry = (IDPEntry) buildXMLObject(IDPEntry.DEFAULT_ELEMENT_NAME);
         
         entry.setProviderID(expectedProviderID);
 
@@ -71,7 +72,7 @@ public class IDPEntryTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        IDPEntry entry = (IDPEntry) buildXMLObject(IDPEntry.DEFAULT_ELEMENT_NAME);
+        final IDPEntry entry = (IDPEntry) buildXMLObject(IDPEntry.DEFAULT_ELEMENT_NAME);
         
         entry.setProviderID(expectedProviderID);
         entry.setName(expectedName);
@@ -84,8 +85,8 @@ public class IDPEntryTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        IDPEntry entry = (IDPEntry) unmarshallElement(singleElementFile);
-        
+        final IDPEntry entry = (IDPEntry) unmarshallElement(singleElementFile);
+        assert entry!=null;
         Assert.assertEquals(entry.getProviderID(), expectedProviderID, "The unmarshalled ProviderID attribute was not the expected value");
 
     }
@@ -94,8 +95,8 @@ public class IDPEntryTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        IDPEntry entry = (IDPEntry) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final IDPEntry entry = (IDPEntry) unmarshallElement(singleElementOptionalAttributesFile);
+        assert entry!=null;
         Assert.assertEquals(entry.getName(), expectedName, "The unmarshalled Name attribute was not the expected value");
         Assert.assertEquals(entry.getLoc(), expectedLocation, "The unmarshalled Loc (location) attribute was not the expected value");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
index 5bead1367..73dc65502 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IDPListTest.java
@@ -35,6 +35,7 @@ import org.opensaml.saml.saml2.core.IDPList;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.IDPEntryImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class IDPListTest extends XMLObjectProviderBaseTestCase {
     
     /** The expected number of IDPEntry children */
@@ -57,7 +58,7 @@ public class IDPListTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        IDPList list = (IDPList) buildXMLObject(IDPList.DEFAULT_ELEMENT_NAME);
+        final IDPList list = (IDPList) buildXMLObject(IDPList.DEFAULT_ELEMENT_NAME);
 
         assertXMLEquals(expectedDOM, list);
     }
@@ -66,14 +67,14 @@ public class IDPListTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        IDPList list = (IDPList) buildXMLObject(IDPList.DEFAULT_ELEMENT_NAME);
+        final  IDPList list = (IDPList) buildXMLObject(IDPList.DEFAULT_ELEMENT_NAME);
         
-        QName idpEntryQName = new QName(SAMLConstants.SAML20P_NS, IDPEntry.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName idpEntryQName = new QName(SAMLConstants.SAML20P_NS, IDPEntry.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         for (int i=0; i<expectedNumIDPEntryChildren; i++){
             list.getIDPEntrys().add((IDPEntry) buildXMLObject(idpEntryQName));
         }
         
-        QName getCompelteQName = new QName(SAMLConstants.SAML20P_NS, GetComplete.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName getCompelteQName = new QName(SAMLConstants.SAML20P_NS, GetComplete.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         list.setGetComplete((GetComplete) buildXMLObject(getCompelteQName));
         
         assertXMLEquals(expectedChildElementsDOM, list);
@@ -83,8 +84,8 @@ public class IDPListTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        IDPList list = (IDPList) unmarshallElement(singleElementFile);
-        
+        final IDPList list = (IDPList) unmarshallElement(singleElementFile);
+        assert list !=null;
         Assert.assertNotNull(list, "IDPList");
         Assert.assertEquals(list.getIDPEntrys().size(), 0, "IDPEntry count");
         Assert.assertNull(list.getGetComplete(), "GetComplete");
@@ -93,8 +94,8 @@ public class IDPListTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        IDPList list = (IDPList) unmarshallElement(childElementsFile);
-        
+        final IDPList list = (IDPList) unmarshallElement(childElementsFile);
+        assert list !=null;        
         Assert.assertEquals(list.getIDPEntrys().size(), expectedNumIDPEntryChildren, "IDPEntry count");
         Assert.assertNotNull(list.getGetComplete(), "GetComplete");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
index c178ac8e7..b30b930c0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/IssuerTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Issuer;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.IssuerImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class IssuerTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Issuer value */
@@ -47,9 +48,9 @@ public class IssuerTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Issuer issuer = (Issuer) unmarshallElement(singleElementFile);
-
-        String issuername = issuer.getValue();
+        final Issuer issuer = (Issuer) unmarshallElement(singleElementFile);
+        assert issuer !=null;
+        final String issuername = issuer.getValue();
         Assert.assertEquals(issuername, expectedIssuer, "Issuer was " + issuername + ", expected " + expectedIssuer);
     }
 
@@ -62,8 +63,8 @@ public class IssuerTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Issuer issuer = (Issuer) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Issuer issuer = (Issuer) buildXMLObject(qname);
 
         issuer.setValue(expectedIssuer);
         assertXMLEquals(expectedDOM, issuer);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
index d4984a546..c287569f5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
@@ -36,6 +36,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.KeyInfoConfirmationDataTypeImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class KeyInfoConfirmationDataTypeTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected NotBefore value. */
@@ -80,9 +81,9 @@ public class KeyInfoConfirmationDataTypeTest extends XMLObjectProviderBaseTestCa
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        KeyInfoConfirmationDataType kicd = (KeyInfoConfirmationDataType) unmarshallElement(singleElementFile);
+        final KeyInfoConfirmationDataType kicd = (KeyInfoConfirmationDataType) unmarshallElement(singleElementFile);
         Assert.assertNotNull(kicd, "Object was null");
-        
+        assert kicd !=null;
         Assert.assertEquals(kicd.getSchemaType(), expectedType, "Object xsi:type was not the expected value");
 
     }
@@ -90,23 +91,23 @@ public class KeyInfoConfirmationDataTypeTest extends XMLObjectProviderBaseTestCa
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        KeyInfoConfirmationDataType kicd = (KeyInfoConfirmationDataType) unmarshallElement(singleElementOptionalAttributesFile);
-
-        Instant notBefore = kicd.getNotBefore();
+        final KeyInfoConfirmationDataType kicd = (KeyInfoConfirmationDataType) unmarshallElement(singleElementOptionalAttributesFile);
+        assert kicd !=null;
+        final Instant notBefore = kicd.getNotBefore();
         Assert.assertEquals(notBefore, expectedNotBefore, "NotBefore was " + notBefore + ", expected " + expectedNotBefore);
 
-        Instant notOnOrAfter = kicd.getNotOnOrAfter();
+        final Instant notOnOrAfter = kicd.getNotOnOrAfter();
         Assert.assertEquals(notOnOrAfter, expectedNotOnOrAfter,
                 "NotOnOrAfter was " + notOnOrAfter + ", expected " + expectedNotOnOrAfter);
 
-        String recipient = kicd.getRecipient();
+        final String recipient = kicd.getRecipient();
         Assert.assertEquals(recipient, expectedRecipient, "Recipient was " + recipient + ", expected " + expectedRecipient);
 
-        String inResponseTo = kicd.getInResponseTo();
+        final String inResponseTo = kicd.getInResponseTo();
         Assert.assertEquals(inResponseTo, expectedInResponseTo,
                 "InResponseTo was " + inResponseTo + ", expected " + expectedInResponseTo);
 
-        String address = kicd.getAddress();
+        final String address = kicd.getAddress();
         Assert.assertEquals(address, expectedAddress, "Address was " + address + ", expected " + expectedAddress);
         
         Assert.assertEquals(kicd.getSchemaType(), expectedType, "Object xsi:type was not the expected value");
@@ -115,7 +116,7 @@ public class KeyInfoConfirmationDataTypeTest extends XMLObjectProviderBaseTestCa
     @Test
     public void testChildElementsUnmarshall() {
         KeyInfoConfirmationDataType kicd = (KeyInfoConfirmationDataType) unmarshallElement(childElementsFile);
-        
+        assert kicd !=null;
         Assert.assertEquals(kicd.getKeyInfos().size(), 3, "Unexpected number of KeyInfo children");
         Assert.assertEquals(kicd.getUnknownXMLObjects(KeyInfo.DEFAULT_ELEMENT_NAME).size(), 3, "Unexpected number of KeyInfo children");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutRequestTest.java
index 9cd2f0c4f..615d3236b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutRequestTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class LogoutRequestTest extends RequestTestBase {
     
     /** Expected Reason attribute value */
@@ -132,8 +133,7 @@ public class LogoutRequestTest extends RequestTestBase {
     @Test
     public void testSingleElementUnmarshall() {
         LogoutRequest req = (LogoutRequest) unmarshallElement(singleElementFile);
-        
-        Assert.assertNotNull(req, "LogoutRequest was null");
+        assert req!=null;
         Assert.assertNull(req.getReason(), "Reason was not null");
         Assert.assertNull(req.getNotOnOrAfter(), "NotOnOrAfter was not null");
         super.helperTestSingleElementUnmarshall(req);
@@ -143,6 +143,7 @@ public class LogoutRequestTest extends RequestTestBase {
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         LogoutRequest req = (LogoutRequest) unmarshallElement(singleElementOptionalAttributesFile);
+        assert req!=null;
         
         Assert.assertEquals(req.getReason(), expectedReason, "Unmarshalled Reason attribute was not the expectecd value");
         Assert.assertEquals(expectedNotOnOrAfter.compareTo(req.getNotOnOrAfter()), 0, "Unmarshalled NotOnOrAfter attribute was not the expectecd value");
@@ -153,6 +154,7 @@ public class LogoutRequestTest extends RequestTestBase {
     @Test
     public void testChildElementsUnmarshall() {
         LogoutRequest req = (LogoutRequest) unmarshallElement(childElementsFile);
+        assert req!=null;
         
         Assert.assertNotNull(req.getNameID(), "Identifier was null");
         Assert.assertEquals(req.getSessionIndexes().size(), expectedNumSessionIndexes, "Number of unmarshalled SessionIndexes was not the expected value");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutResponseTest.java
index 4bd6b8615..4b52d52cf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/LogoutResponseTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class LogoutResponseTest extends StatusResponseTestBase {
 
     /**
@@ -55,7 +56,7 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         LogoutResponse resp = (LogoutResponse) buildXMLObject(qname);
         
         super.populateRequiredAttributes(resp);
@@ -71,7 +72,7 @@ public class LogoutResponseTest extends StatusResponseTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
 
         ((LogoutResponse)target).setID("id123");
 
@@ -81,8 +82,8 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        LogoutResponse resp = (LogoutResponse) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final LogoutResponse resp = (LogoutResponse) buildXMLObject(qname);
         
         super.populateRequiredAttributes(resp);
         super.populateOptionalAttributes(resp);
@@ -93,8 +94,8 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        LogoutResponse resp = (LogoutResponse) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20P_NS, LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final LogoutResponse resp = (LogoutResponse) buildXMLObject(qname);
         
         super.populateChildElements(resp);
         
@@ -104,7 +105,7 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        LogoutResponse resp = (LogoutResponse) unmarshallElement(singleElementFile);
+        final LogoutResponse resp = (LogoutResponse) unmarshallElement(singleElementFile);
         
         super.helperTestSingleElementUnmarshall(resp);
     }
@@ -112,7 +113,7 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        LogoutResponse resp = (LogoutResponse) unmarshallElement(singleElementOptionalAttributesFile);
+        final LogoutResponse resp = (LogoutResponse) unmarshallElement(singleElementOptionalAttributesFile);
 
         super.helperTestSingleElementOptionalAttributesUnmarshall(resp);
     }
@@ -120,7 +121,7 @@ public class LogoutResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        LogoutResponse resp = (LogoutResponse) unmarshallElement(childElementsFile);
+        final LogoutResponse resp = (LogoutResponse) unmarshallElement(childElementsFile);
         
         super.helperTestChildElementsUnmarshall(resp);
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestTest.java
index 31ba991fb..01bf396dc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ManageNameIDRequestTest extends RequestTestBase {
 
     /**
@@ -132,7 +133,8 @@ public class ManageNameIDRequestTest extends RequestTestBase {
     @Test
     public void testChildElementsUnmarshall() {
         ManageNameIDRequest req = (ManageNameIDRequest) unmarshallElement(childElementsFile);
-        
+        assert req!=null;
+
         Assert.assertNotNull(req.getNameID(), "NameID was null");
         Assert.assertNotNull(req.getNewID(), "NewID was null");
         super.helperTestChildElementsUnmarshall(req);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseTest.java
index b56975867..c58dcd7dd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ManageNameIDResponseTest extends StatusResponseTestBase {
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestTest.java
index d3bdf8a29..373212665 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDMappingRequestTest extends RequestTestBase {
 
     /**
@@ -133,7 +134,7 @@ public class NameIDMappingRequestTest extends RequestTestBase {
     @Test
     public void testChildElementsUnmarshall() {
         NameIDMappingRequest req = (NameIDMappingRequest) unmarshallElement(childElementsFile);
-        
+        assert req!=null;
         Assert.assertNotNull(req.getNameID(), "Identifier was null");
         Assert.assertNotNull(req.getNameIDPolicy(), "NameIDPolicy was null");
         super.helperTestChildElementsUnmarshall(req);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseTest.java
index cedb6398c..20cd42281 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseTest.java
@@ -36,6 +36,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDMappingResponseTest extends StatusResponseTestBase {
 
     /**
@@ -130,6 +131,7 @@ public class NameIDMappingResponseTest extends StatusResponseTestBase {
     @Test
     public void testChildElementsUnmarshall() {
         NameIDMappingResponse resp = (NameIDMappingResponse) unmarshallElement(childElementsFile);
+        assert resp!=null;
         
         Assert.assertNotNull(resp.getNameID(), "Identifier was null");
         super.helperTestChildElementsUnmarshall(resp);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
index 6a2f61aad..7f813360f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.core.NameIDPolicy;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.NameIDPolicyImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDPolicyTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected Format*/
@@ -90,6 +91,7 @@ public class NameIDPolicyTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         NameIDPolicy policy = (NameIDPolicy) unmarshallElement(singleElementOptionalAttributesFile);
+        assert policy!=null;
         
         Assert.assertEquals(policy.getFormat(), expectedFormat, "Unmarshalled name Format URI attribute value was not the expected value");
         Assert.assertEquals(policy.getSPNameQualifier(), expectedSPNameQualifer, "Unmarshalled SPNameQualifier URI attribute value was not the expected value");
@@ -109,14 +111,19 @@ public class NameIDPolicyTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(policy.getAllowCreateXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(policy.getAllowCreateXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(policy.getAllowCreateXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool;
+        bool = policy.getAllowCreateXSBoolean();
+        assert bool!=null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         policy.setAllowCreate(Boolean.FALSE);
         Assert.assertEquals(policy.getAllowCreate(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(policy.getAllowCreateXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(policy.getAllowCreateXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(policy.getAllowCreateXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool = policy.getAllowCreateXSBoolean();
+        assert bool!=null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
         
         policy.setAllowCreate((Boolean) null);
         Assert.assertEquals(policy.getAllowCreate(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
index eb00c8db5..2a2f6e522 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NameIDTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.NameID;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.NameIDImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Name value */
@@ -64,30 +65,32 @@ public class NameIDTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        NameID nameID = (NameID) unmarshallElement(singleElementFile);
+        final NameID nameID = (NameID) unmarshallElement(singleElementFile);
+        assert nameID !=null;
 
-        String name = nameID.getValue();
+        final String name = nameID.getValue();
         Assert.assertEquals(expectedName, name, "Name not as expected");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        NameID nameID = (NameID) unmarshallElement(singleElementOptionalAttributesFile);
+        final NameID nameID = (NameID) unmarshallElement(singleElementOptionalAttributesFile);
+        assert nameID !=null;
 
-        String name = nameID.getValue();
+        final String name = nameID.getValue();
         Assert.assertEquals(expectedName, name, "Name not as expected");
 
-        String nameQualifier = nameID.getNameQualifier();
+        final String nameQualifier = nameID.getNameQualifier();
         Assert.assertEquals(expectedNameQualifier, nameQualifier, "NameQualifier not as expected");
 
-        String spNameQualifier = nameID.getSPNameQualifier();
+        final String spNameQualifier = nameID.getSPNameQualifier();
         Assert.assertEquals(expectedSPNameQualifier, spNameQualifier, "SPNameQualifier not as expected");
 
-        String format = nameID.getFormat();
+        final String format = nameID.getFormat();
         Assert.assertEquals(expectedFormat, format, "Format not as expected");
 
-        String spProvidedID = nameID.getSPProvidedID();
+        final String spProvidedID = nameID.getSPProvidedID();
         Assert.assertEquals(expectedSPID, spProvidedID, "SPProviderID not as expected");
     }
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
index 2f0a492ef..528ecf3c4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDTest.java
@@ -27,6 +27,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.NewEncryptedIDImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NewEncryptedIDTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of EncryptedKey subelements. */
@@ -43,7 +44,7 @@ public class NewEncryptedIDTest extends XMLObjectProviderBaseTestCase {
     public void testSingleElementUnmarshall() {
         NewEncryptedID encElement = (NewEncryptedID) unmarshallElement(singleElementFile);
 
-        Assert.assertNotNull(encElement);
+        assert encElement!=null;
         Assert.assertNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), 0, "# of EncryptedKey children");
     }
@@ -53,7 +54,7 @@ public class NewEncryptedIDTest extends XMLObjectProviderBaseTestCase {
     public void testChildElementsUnmarshall() {
         NewEncryptedID encElement = (NewEncryptedID) unmarshallElement(childElementsFile);
         
-        Assert.assertNotNull(encElement, "NewEncryptedID was null");
+        assert encElement!=null;
         Assert.assertNotNull(encElement.getEncryptedData(), "EncryptedData child element");
         Assert.assertEquals(encElement.getEncryptedKeys().size(), encryptedKeyCount, "# of EncryptedKey children");
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
index 3e72bcafa..67189e300 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/NewIDTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.NewID;
 /**
  * 
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NewIDTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected element content */
@@ -51,15 +52,15 @@ public class NewIDTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        NewID newID = (NewID) unmarshallElement(singleElementFile);
-        
-       Assert.assertEquals(newID.getValue(), expectedNewID, "The unmarshalled NewID was not the expected value");
+        final NewID newID = (NewID) unmarshallElement(singleElementFile);
+        assert newID!=null;
+        Assert.assertEquals(newID.getValue(), expectedNewID, "The unmarshalled NewID was not the expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        NewID newID = (NewID) buildXMLObject(NewID.DEFAULT_ELEMENT_NAME);
+        final NewID newID = (NewID) buildXMLObject(NewID.DEFAULT_ELEMENT_NAME);
         
         newID.setValue(expectedNewID);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
index fe7544152..22ba0823e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/OneTimeUseTest.java
@@ -28,6 +28,7 @@ import org.opensaml.saml.saml2.core.OneTimeUse;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.OneTimeUseImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class OneTimeUseTest extends XMLObjectProviderBaseTestCase {
 
     /** Constructor */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
index fc4acebdd..3428a0a9e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.ProxyRestriction;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.ProxyRestrictionImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ProxyRestrictionTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected proxy Count */
@@ -46,9 +47,10 @@ public class ProxyRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        ProxyRestriction proxyRestriction = (ProxyRestriction) unmarshallElement(singleElementFile);
-
-        int count = proxyRestriction.getProxyCount();
+        final ProxyRestriction proxyRestriction = (ProxyRestriction) unmarshallElement(singleElementFile);
+        assert proxyRestriction!=null;
+        
+        Integer count = proxyRestriction.getProxyCount();
         Assert.assertEquals(count, expectedCount, "ProxyCount not as expected");
     }
 
@@ -61,8 +63,8 @@ public class ProxyRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        ProxyRestriction proxyRestriction = (ProxyRestriction) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final ProxyRestriction proxyRestriction = (ProxyRestriction) buildXMLObject(qname);
 
         proxyRestriction.setProxyCount(expectedCount);
 
@@ -78,17 +80,18 @@ public class ProxyRestrictionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        ProxyRestriction proxyRestriction = (ProxyRestriction) unmarshallElement(childElementsFile);
+        final ProxyRestriction proxyRestriction = (ProxyRestriction) unmarshallElement(childElementsFile);
+        assert proxyRestriction!=null;
         Assert.assertEquals(proxyRestriction.getAudiences().size(), expectedAudienceCount, "Audience Count");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        ProxyRestriction proxyRestriction = (ProxyRestriction) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final ProxyRestriction proxyRestriction = (ProxyRestriction) buildXMLObject(qname);
 
-        QName audienceQName = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName audienceQName = new QName(SAMLConstants.SAML20_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < expectedAudienceCount; i++) {
             proxyRestriction.getAudiences().add((Audience) buildXMLObject(audienceQName));
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
index 82559aeb0..c4482e021 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
@@ -35,6 +35,7 @@ import org.opensaml.saml.saml2.core.RequestAbstractType;
 /**
  * 
  */
+ at SuppressWarnings({"null", "javadoc"})
 public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
 
     /** Expected ID value */
@@ -71,7 +72,7 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
         expectedDestination = "http://idp.example.org/endpoint";
         expectedConsent = "urn:string:consent";
 
-        QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
         expectedIssuer = (Issuer) buildXMLObject(issuerQName);
     }
@@ -124,11 +125,13 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     }
 
     protected void helperTestSingleElementUnmarshall(SAMLObject samlObject) {
-        RequestAbstractType req = (RequestAbstractType) samlObject;
+        final RequestAbstractType req = (RequestAbstractType) samlObject;
+        assert req!=null; 
 
         Assert.assertEquals(req.getID(), expectedID, "Unmarshalled ID attribute was not the expected value");
-        Assert.assertEquals(req
-                .getVersion().toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
+        final SAMLVersion ver = req.getVersion();
+        assert ver!=null;
+        Assert.assertEquals(ver.toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
         Assert.assertEquals(expectedIssueInstant
                 .compareTo(req.getIssueInstant()), 0, "Unmarshalled IssueInstant attribute was not the expected value");
 
@@ -138,11 +141,12 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     }
 
     protected void helperTestSingleElementOptionalAttributesUnmarshall(SAMLObject samlObject) {
-        RequestAbstractType req = (RequestAbstractType) samlObject;
+        final RequestAbstractType req = (RequestAbstractType) samlObject;
 
         Assert.assertEquals(req.getID(), expectedID, "Unmarshalled ID attribute was not the expected value");
-        Assert.assertEquals(req
-                .getVersion().toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
+        final SAMLVersion ver = req.getVersion();
+        assert ver!=null;
+        Assert.assertEquals(ver.toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
         Assert.assertEquals(expectedIssueInstant
                 .compareTo(req.getIssueInstant()), 0, "Unmarshalled IssueInstant attribute was not the expected value");
 
@@ -153,7 +157,7 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     }
 
     protected void helperTestChildElementsUnmarshall(SAMLObject samlObject) {
-        RequestAbstractType req = (RequestAbstractType) samlObject;
+        final RequestAbstractType req = (RequestAbstractType) samlObject;
 
         Assert.assertNotNull(req.getIssuer(), "Issuer was null");
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
index 47ef042bd..7badd736c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextTest.java
@@ -35,6 +35,7 @@ import org.opensaml.saml.saml2.core.RequestedAuthnContext;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class RequestedAuthnContextTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected Comparison attribute */
@@ -64,7 +65,7 @@ public class RequestedAuthnContextTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
+        final RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
         
         assertXMLEquals(expectedDOM, rac);
 
@@ -73,7 +74,7 @@ public class RequestedAuthnContextTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
+        final RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
         
         rac.setComparison(AuthnContextComparisonTypeEnumeration.EXACT);
         
@@ -83,9 +84,9 @@ public class RequestedAuthnContextTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
+        final RequestedAuthnContext rac = (RequestedAuthnContext) buildXMLObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
         
-        QName authnContextClassRefQName = new QName(SAMLConstants.SAML20_NS, AuthnContextClassRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName authnContextClassRefQName = new QName(SAMLConstants.SAML20_NS, AuthnContextClassRef.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i=0; i< expectedNumClassRefs; i++){
             rac.getAuthnContextClassRefs().add((AuthnContextClassRef) buildXMLObject(authnContextClassRefQName));
         }
@@ -96,24 +97,27 @@ public class RequestedAuthnContextTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(singleElementFile);
+        final RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(singleElementFile);
         
-        Assert.assertNotNull(rac, "RequestedAuthnContext");
+        assert rac!=null;
         Assert.assertNull(rac.getComparison(), "Comparison");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(singleElementOptionalAttributesFile);
-        Assert.assertNotNull(rac.getComparison(), "Comparison");
-        Assert.assertEquals(rac.getComparison().toString(), expectedComparison.toString(), "The unmarshalled Comparison attribute was not the expected value");
+        final RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(singleElementOptionalAttributesFile);
+        assert rac!=null;
+        final AuthnContextComparisonTypeEnumeration comp = rac.getComparison();
+        assert comp!= null;
+        Assert.assertEquals(comp.toString(), expectedComparison.toString(), "The unmarshalled Comparison attribute was not the expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(childElementsFile);
+        final RequestedAuthnContext rac = (RequestedAuthnContext) unmarshallElement(childElementsFile);
+        assert rac!=null;
        
         Assert.assertEquals(rac.getAuthnContextClassRefs().size(), expectedNumClassRefs, "AuthnContextClassRef");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
index 32d5da2f9..ae5c90547 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequesterIDTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.core.RequesterID;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.RequesterIDImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class RequesterIDTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected element content*/
@@ -52,15 +53,15 @@ public class RequesterIDTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        RequesterID reqID = (RequesterID) unmarshallElement(singleElementFile);
-        
+       final RequesterID reqID = (RequesterID) unmarshallElement(singleElementFile);
+       assert reqID!=null; 
        Assert.assertEquals(reqID.getURI(), expectedRequesterID, "Unmarshalled requester ID was not the expected value"); 
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        RequesterID reqID = (RequesterID) buildXMLObject(RequesterID.DEFAULT_ELEMENT_NAME);
+        final RequesterID reqID = (RequesterID) buildXMLObject(RequesterID.DEFAULT_ELEMENT_NAME);
 
         reqID.setURI(expectedRequesterID);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ResponseTest.java
index 1e15361fc..69eb86f47 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ResponseTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.ResponseImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ResponseTest extends StatusResponseTestBase {
     
     /** Expected number of Assertion child elements. */
@@ -69,9 +70,9 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = 
+        final QName qname = 
             new QName(SAMLConstants.SAML20P_NS, Response.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        Response resp = (Response) buildXMLObject(qname);
+        final Response resp = (Response) buildXMLObject(qname);
         
         super.populateRequiredAttributes(resp);
         
@@ -86,7 +87,7 @@ public class ResponseTest extends StatusResponseTestBase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
 
         ((Response)target).setID("id123");
 
@@ -96,9 +97,9 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = 
+        final QName qname = 
             new QName(SAMLConstants.SAML20P_NS, Response.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
-        Response resp = (Response) buildXMLObject(qname);
+        final Response resp = (Response) buildXMLObject(qname);
         
         super.populateRequiredAttributes(resp);
         super.populateOptionalAttributes(resp);
@@ -109,7 +110,7 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        Response resp = (Response) buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
+        final Response resp = (Response) buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
         
         super.populateChildElements(resp);
         
@@ -125,7 +126,7 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Response resp = (Response) unmarshallElement(singleElementFile);
+        final Response resp = (Response) unmarshallElement(singleElementFile);
         
         Assert.assertNotNull(resp, "Response was null");
         super.helperTestSingleElementUnmarshall(resp);
@@ -134,7 +135,7 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        Response resp = (Response) unmarshallElement(singleElementOptionalAttributesFile);
+        final Response resp = (Response) unmarshallElement(singleElementOptionalAttributesFile);
         
         Assert.assertNotNull(resp, "Response was null");
         super.helperTestSingleElementOptionalAttributesUnmarshall(resp);
@@ -143,8 +144,8 @@ public class ResponseTest extends StatusResponseTestBase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Response resp = (Response) unmarshallElement(childElementsFile);
-        
+        final Response resp = (Response) unmarshallElement(childElementsFile);
+        assert resp!=null;
         Assert.assertEquals(resp.getAssertions().size(), expectedNumAssertions, "Assertion count");
         Assert.assertEquals(resp.getEncryptedAssertions().size(), expectedNumEncryptedAssertions, "EncryptedAssertion count");
         super.helperTestChildElementsUnmarshall(resp);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
index 2f7bdcc36..cee8fa81b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ScopingTest.java
@@ -35,6 +35,7 @@ import org.opensaml.saml.saml2.core.Scoping;
  *Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.ScopingImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ScopingTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected ProxyCount*/
@@ -62,7 +63,7 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
+        final Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
         
         assertXMLEquals(expectedDOM, scoping);
 
@@ -71,7 +72,7 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
+        final Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
         
         scoping.setProxyCount(Integer.valueOf(expectedProxyCount));
         
@@ -81,12 +82,12 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
+        final Scoping scoping = (Scoping) buildXMLObject(Scoping.DEFAULT_ELEMENT_NAME);
         
-        QName idpListQName = new QName(SAMLConstants.SAML20P_NS, IDPList.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName idpListQName = new QName(SAMLConstants.SAML20P_NS, IDPList.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         scoping.setIDPList((IDPList) buildXMLObject(idpListQName));
         
-        QName requesterIDQName = new QName(SAMLConstants.SAML20P_NS, RequesterID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName requesterIDQName = new QName(SAMLConstants.SAML20P_NS, RequesterID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         for (int i = 0; i<expectedNumRequestIDs; i++){
             scoping.getRequesterIDs().add((RequesterID) buildXMLObject(requesterIDQName));
         }
@@ -97,8 +98,8 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Scoping scoping = (Scoping) unmarshallElement(singleElementFile);
-        
+        final Scoping scoping = (Scoping) unmarshallElement(singleElementFile);
+        assert scoping!=null;
         Assert.assertNull(scoping.getProxyCount(), "ProxyCount");
         Assert.assertNull(scoping.getIDPList(), "IDPList");
         Assert.assertEquals(scoping.getRequesterIDs().size(), 0 , "RequesterID count");
@@ -108,8 +109,8 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        Scoping scoping = (Scoping) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final Scoping scoping = (Scoping) unmarshallElement(singleElementOptionalAttributesFile);
+        assert scoping!=null;
         Assert.assertNotNull(scoping.getProxyCount(), "ProxyCount");
         Assert.assertNull(scoping.getIDPList(), "IDPList");
         Assert.assertEquals(scoping.getRequesterIDs().size(), 0, "RequesterID count");
@@ -118,8 +119,8 @@ public class ScopingTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Scoping scoping = (Scoping) unmarshallElement(childElementsFile);
-        
+        final Scoping scoping = (Scoping) unmarshallElement(childElementsFile);
+        assert scoping!=null;
         Assert.assertNull(scoping.getProxyCount(), "ProxyCount");
         Assert.assertNotNull(scoping.getIDPList(), "IDPList");
         Assert.assertEquals(scoping.getRequesterIDs().size(), expectedNumRequestIDs, "RequesterID count");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
index ac71e4518..f8b9087e0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SessionIndexTest.java
@@ -20,15 +20,16 @@
  */
 package org.opensaml.saml.saml2.core.impl;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
 import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
 import org.opensaml.saml.saml2.core.SessionIndex;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SessionIndexTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected element content */
@@ -53,15 +54,15 @@ public class SessionIndexTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SessionIndex si = (SessionIndex) unmarshallElement(singleElementFile);
-        
+        final SessionIndex si = (SessionIndex) unmarshallElement(singleElementFile);
+        assert si !=null;
         Assert.assertEquals(si.getValue(), expectedSessionIndex, "The unmarshalled session index as not the expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        SessionIndex si = (SessionIndex) buildXMLObject(SessionIndex.DEFAULT_ELEMENT_NAME);
+        final SessionIndex si = (SessionIndex) buildXMLObject(SessionIndex.DEFAULT_ELEMENT_NAME);
         
         si.setValue(expectedSessionIndex);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
index bd0066789..c0a25a932 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusCodeTest.java
@@ -20,19 +20,20 @@
  */
 package org.opensaml.saml.saml2.core.impl;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.core.StatusCode;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.StatusCodeImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected Value attribute value*/
@@ -79,16 +80,16 @@ public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        StatusCode statusCode = (StatusCode) unmarshallElement(singleElementFile);
-        
+        final StatusCode statusCode = (StatusCode) unmarshallElement(singleElementFile);
+        assert statusCode !=null;
         Assert.assertEquals(statusCode.getValue(), expectedValue, "Unmarshalled status code URI value was not the expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        StatusCode statusCode = (StatusCode) unmarshallElement(childElementsFile);
-        
+        final StatusCode statusCode = (StatusCode) unmarshallElement(childElementsFile);
+        assert statusCode !=null;        
         Assert.assertNotNull(statusCode.getStatusCode());
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
index 3364b01e3..81cdf0556 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusDetailTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.core.StatusDetail;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.StatusDetailImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class StatusDetailTest extends XMLObjectProviderBaseTestCase {
 
     /**
@@ -45,7 +46,7 @@ public class StatusDetailTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        StatusDetail statusDetail = (StatusDetail) buildXMLObject(StatusDetail.DEFAULT_ELEMENT_NAME);
+        final StatusDetail statusDetail = (StatusDetail) buildXMLObject(StatusDetail.DEFAULT_ELEMENT_NAME);
         
         assertXMLEquals(expectedDOM, statusDetail);
     }
@@ -53,8 +54,8 @@ public class StatusDetailTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        StatusDetail statusDetail = (StatusDetail) buildXMLObject(StatusDetail.DEFAULT_ELEMENT_NAME);
-        QName childQname = new QName("http://www.example.org/testObjects", "SimpleElement", "test");
+        final StatusDetail statusDetail = (StatusDetail) buildXMLObject(StatusDetail.DEFAULT_ELEMENT_NAME);
+        final QName childQname = new QName("http://www.example.org/testObjects", "SimpleElement", "test");
         
         statusDetail.getUnknownXMLObjects().add(buildXMLObject(childQname));
         statusDetail.getUnknownXMLObjects().add(buildXMLObject(childQname));
@@ -68,7 +69,7 @@ public class StatusDetailTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        StatusDetail statusDetail = (StatusDetail) unmarshallElement(singleElementFile);
+        final StatusDetail statusDetail = (StatusDetail) unmarshallElement(singleElementFile);
         
         Assert.assertNotNull(statusDetail);
     }
@@ -76,9 +77,8 @@ public class StatusDetailTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        StatusDetail statusDetail = (StatusDetail) unmarshallElement(childElementsFile);
-        
-        Assert.assertNotNull(statusDetail);
+        final StatusDetail statusDetail = (StatusDetail) unmarshallElement(childElementsFile);
+        assert statusDetail!=null;
         Assert.assertEquals(statusDetail.getUnknownXMLObjects().size(), 3);
     }
     
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
index 108919761..d047c6266 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusMessageTest.java
@@ -27,6 +27,7 @@ import org.opensaml.saml.saml2.core.StatusMessage;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.StatusMessageImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
     
    /** The expected message*/ 
@@ -49,7 +50,7 @@ public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        StatusMessage message = (StatusMessage) buildXMLObject(StatusMessage.DEFAULT_ELEMENT_NAME);
+        final StatusMessage message = (StatusMessage) buildXMLObject(StatusMessage.DEFAULT_ELEMENT_NAME);
         
         message.setValue(expectedMessage);
         
@@ -59,8 +60,9 @@ public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        StatusMessage message = (StatusMessage) unmarshallElement(singleElementFile);
-        
+        final StatusMessage message = (StatusMessage) unmarshallElement(singleElementFile);
+        assert message!=null;
+
         Assert.assertEquals(message.getValue(), expectedMessage, "Unmarshalled status message was not the expected value");   
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
index f9e7ea934..9e288894c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
@@ -39,6 +39,7 @@ import org.opensaml.saml.saml2.core.StatusResponseType;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCase {
     
     /** Expected ID attribute */
@@ -82,10 +83,10 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
         expectedDestination = "http://sp.example.org/endpoint";
         expectedConsent = "urn:string:consent";
         
-        QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName issuerQName = new QName(SAMLConstants.SAML20_NS, Issuer.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         expectedIssuer = (Issuer) buildXMLObject(issuerQName);
         
-        QName statusQName = new QName(SAMLConstants.SAML20P_NS, Status.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final  QName statusQName = new QName(SAMLConstants.SAML20P_NS, Status.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         expectedStatus = (Status) buildXMLObject(statusQName);
     }
 
@@ -105,7 +106,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
      * @param samlObject ...
      */
     protected void populateRequiredAttributes(SAMLObject samlObject) {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
         
         sr.setID(expectedID);
         sr.setIssueInstant(expectedIssueInstant);
@@ -120,7 +121,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
      * @param samlObject ...
      */
     protected void populateOptionalAttributes(SAMLObject samlObject) {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
         
         sr.setInResponseTo(expectedInResponseTo);
         sr.setConsent(expectedConsent);
@@ -134,7 +135,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
      * @param samlObject ...
      */
     protected void populateChildElements(SAMLObject samlObject) {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
         
         sr.setIssuer(expectedIssuer);
         sr.setStatus(expectedStatus);
@@ -145,7 +146,9 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
         StatusResponseType sr = (StatusResponseType) samlObject;
         
         Assert.assertEquals(sr.getID(), expectedID, "Unmarshalled ID attribute was not the expected value");
-        Assert.assertEquals(sr.getVersion().toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
+        final SAMLVersion ver = sr.getVersion();
+        assert ver != null;
+        Assert.assertEquals(ver.toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
         Assert.assertEquals(expectedIssueInstant.compareTo(sr.getIssueInstant()), 0, "Unmarshalled IssueInstant attribute was not the expected value");
         
         Assert.assertNull(sr.getInResponseTo(), "InResponseTo was not null");
@@ -155,10 +158,12 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
     }
     
     protected void helperTestSingleElementOptionalAttributesUnmarshall(SAMLObject samlObject) {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
         
         Assert.assertEquals(sr.getID(), expectedID, "Unmarshalled ID attribute was not the expected value");
-        Assert.assertEquals(sr.getVersion().toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
+        final SAMLVersion ver = sr.getVersion();
+        assert ver != null;
+        Assert.assertEquals(ver.toString(), expectedSAMLVersion.toString(), "Unmarshalled Version attribute was not the expected value");
         Assert.assertEquals(expectedIssueInstant.compareTo(sr.getIssueInstant()), 0, "Unmarshalled IssueInstant attribute was not the expected value");
         
         Assert.assertEquals(sr.getInResponseTo(), expectedInResponseTo, "Unmarshalled InResponseTo attribute was not the expected value");
@@ -168,7 +173,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
     }
 
     protected void helperTestChildElementsUnmarshall(SAMLObject samlObject) {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
         
         Assert.assertNotNull(sr.getIssuer(), "Issuer was null");
         Assert.assertNotNull(sr.getIssuer(), "Status was null");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
index 0d16e568a..30a9c9f61 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusTest.java
@@ -34,6 +34,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.StatusImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class StatusTest extends XMLObjectProviderBaseTestCase {
 
     /**
@@ -48,7 +49,7 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        Status status = (Status) buildXMLObject(Status.DEFAULT_ELEMENT_NAME);
+        final Status status = (Status) buildXMLObject(Status.DEFAULT_ELEMENT_NAME);
         
         assertXMLEquals(expectedDOM, status);
     }
@@ -56,12 +57,12 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        Status status = (Status) buildXMLObject(Status.DEFAULT_ELEMENT_NAME);
+        final Status status = (Status) buildXMLObject(Status.DEFAULT_ELEMENT_NAME);
         
-        QName statusCodeQName = new QName(SAMLConstants.SAML20P_NS, StatusCode.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName statusCodeQName = new QName(SAMLConstants.SAML20P_NS, StatusCode.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         status.setStatusCode((StatusCode) buildXMLObject(statusCodeQName));
         
-        QName statusMessageQName = new QName(SAMLConstants.SAML20P_NS, StatusMessage.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+        final QName statusMessageQName = new QName(SAMLConstants.SAML20P_NS, StatusMessage.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
         status.setStatusMessage((StatusMessage) buildXMLObject(statusMessageQName));
         
         assertXMLEquals(expectedChildElementsDOM, status);
@@ -71,9 +72,8 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Status status = (Status) unmarshallElement(singleElementFile);
-        
-        Assert.assertNotNull(status, "Status");
+        final Status status = (Status) unmarshallElement(singleElementFile);
+        assert status !=null;
         Assert.assertNull(status.getStatusCode(), "StatusCode child");
         Assert.assertNull(status.getStatusMessage(), "StatusMessage");
     }
@@ -82,8 +82,8 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Status status = (Status) unmarshallElement(childElementsFile);
-        
+        final Status status = (Status) unmarshallElement(childElementsFile);
+        assert status !=null;
         Assert.assertNotNull(status.getStatusCode(), "StatusCode of Status was null");
         Assert.assertNotNull(status.getStatusMessage(), "StatusMessage of Status was null");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
index 0ddf119aa..83e3cf1b4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataTest.java
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml2.core.SubjectConfirmationData;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.core.impl.SubjectConfirmationDataImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SubjectConfirmationDataTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected NotBefore value */
@@ -68,41 +69,42 @@ public class SubjectConfirmationDataTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SubjectConfirmationData subjectCD = (SubjectConfirmationData) unmarshallElement(singleElementFile);
-
-        Instant notBefore = subjectCD.getNotBefore();
+        final SubjectConfirmationData subjectCD = (SubjectConfirmationData) unmarshallElement(singleElementFile);
+        assert subjectCD !=null;
+        final Instant notBefore = subjectCD.getNotBefore();
         Assert.assertEquals(notBefore, expectedNotBefore, "NotBefore was " + notBefore + ", expected " + expectedNotBefore);
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        SubjectConfirmationData subjectCD = (SubjectConfirmationData) unmarshallElement(singleElementOptionalAttributesFile);
+        final SubjectConfirmationData subjectCD = (SubjectConfirmationData) unmarshallElement(singleElementOptionalAttributesFile);
+        assert subjectCD !=null;
 
-        Instant notBefore = subjectCD.getNotBefore();
+        final Instant notBefore = subjectCD.getNotBefore();
         Assert.assertEquals(notBefore, expectedNotBefore, "NotBefore was " + notBefore + ", expected " + expectedNotBefore);
 
-        Instant notOnOrAfter = subjectCD.getNotOnOrAfter();
+        final Instant notOnOrAfter = subjectCD.getNotOnOrAfter();
         Assert.assertEquals(notOnOrAfter, expectedNotOnOrAfter,
                 "NotOnOrAfter was " + notOnOrAfter + ", expected " + expectedNotOnOrAfter);
 
-        String recipient = subjectCD.getRecipient();
+        final String recipient = subjectCD.getRecipient();
         Assert.assertEquals(recipient, expectedRecipient, "Recipient was " + recipient + ", expected " + expectedRecipient);
 
-        String inResponseTo = subjectCD.getInResponseTo();
+        final String inResponseTo = subjectCD.getInResponseTo();
         Assert.assertEquals(inResponseTo, expectedInResponseTo,
                 "InResponseTo was " + inResponseTo + ", expected " + expectedInResponseTo);
 
-        String address = subjectCD.getAddress();
+        final String address = subjectCD.getAddress();
         Assert.assertEquals(address, expectedAddress, "Address was " + address + ", expected " + expectedAddress);
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        SubjectConfirmationData subjectCD = (SubjectConfirmationData) buildXMLObject(qname);
+        final SubjectConfirmationData subjectCD = (SubjectConfirmationData) buildXMLObject(qname);
 
         subjectCD.setNotBefore(expectedNotBefore);
         assertXMLEquals(expectedDOM, subjectCD);
@@ -111,9 +113,9 @@ public class SubjectConfirmationDataTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        SubjectConfirmationData subjectCD = (SubjectConfirmationData) buildXMLObject(qname);
+        final SubjectConfirmationData subjectCD = (SubjectConfirmationData) buildXMLObject(qname);
 
         subjectCD.setNotBefore(expectedNotBefore);
         subjectCD.setNotOnOrAfter(expectedNotOnOrAfter);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
index 1b84c21c1..1b310770e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationTest.java
@@ -35,6 +35,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.SubjectConfirmationImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Method value */
@@ -58,9 +59,9 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(singleElementFile);
-
-        String method = subjectConfirmation.getMethod();
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(singleElementFile);
+        assert subjectConfirmation!=null;
+        final String method = subjectConfirmation.getMethod();
         Assert.assertEquals(method, expectedMethod, "Method not as expected");
     }
 
@@ -73,8 +74,8 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
 
         subjectConfirmation.setMethod(expectedMethod);
         assertXMLEquals(expectedDOM, subjectConfirmation);
@@ -89,8 +90,8 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(childElementsFile);
-
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(childElementsFile);
+        assert subjectConfirmation!=null;
         Assert.assertNotNull(subjectConfirmation.getNameID(), "Identifier elemement not present");
         Assert.assertNotNull(subjectConfirmation.getSubjectConfirmationData(), "SubjectConfirmationData element not present");
     }
@@ -98,13 +99,13 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
 
-        QName nameIDQName = new QName(SAMLConstants.SAML20_NS, NameID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName nameIDQName = new QName(SAMLConstants.SAML20_NS, NameID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         subjectConfirmation.setNameID((NameID) buildXMLObject(nameIDQName));
         
-        QName subjectConfirmationDataQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final  QName subjectConfirmationDataQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         subjectConfirmation.setSubjectConfirmationData((SubjectConfirmationData) buildXMLObject(subjectConfirmationDataQName));
 
         assertXMLEquals(expectedChildElementsDOM, subjectConfirmation);
@@ -112,8 +113,8 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
     
     @Test
     public void testChildElementsWithEncryptedIDUnmarshall() {
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(childElementsWithEncryptedIDFile);
-
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(childElementsWithEncryptedIDFile);
+        assert subjectConfirmation!=null;
         Assert.assertNull(subjectConfirmation.getBaseID(), "BaseID element present");
         Assert.assertNull(subjectConfirmation.getNameID(), "NameID element present");
         Assert.assertNotNull(subjectConfirmation.getEncryptedID(), "EncryptedID element not present");
@@ -122,16 +123,16 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
 
     @Test
     public void testChildElementsWithEncryptedIDMarshall() throws XMLParserException {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) buildXMLObject(qname);
 
-        QName encryptedIDQName = new QName(SAMLConstants.SAML20_NS, EncryptedID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName encryptedIDQName = new QName(SAMLConstants.SAML20_NS, EncryptedID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         subjectConfirmation.setEncryptedID((EncryptedID) buildXMLObject(encryptedIDQName));
         
-        QName subjectConfirmationDataQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName subjectConfirmationDataQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmationData.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         subjectConfirmation.setSubjectConfirmationData((SubjectConfirmationData) buildXMLObject(subjectConfirmationDataQName));
         
-        Document expectedChildElementsWithEncryptedID = parserPool.parse(SubjectConfirmationTest.class
+        final Document expectedChildElementsWithEncryptedID = parserPool.parse(SubjectConfirmationTest.class
                 .getResourceAsStream(childElementsWithEncryptedIDFile));
         assertXMLEquals(expectedChildElementsWithEncryptedID, subjectConfirmation);
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
index cb678d5e4..1c6de9830 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.SubjectLocality;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.SubjectLocalityImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Address value */
@@ -52,8 +53,9 @@ public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementFile);
-        String address = subjectLocality.getAddress();
+        final SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementFile);
+        assert subjectLocality !=null;
+        final String address = subjectLocality.getAddress();
 
         Assert.assertEquals(address, expectedAddress, "Address was " + address + ", expected " + expectedAddress);
 
@@ -62,12 +64,12 @@ public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementOptionalAttributesFile);
-
-        String address = subjectLocality.getAddress();
+        final SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementOptionalAttributesFile);
+        assert subjectLocality !=null;
+        final String address = subjectLocality.getAddress();
         Assert.assertEquals(address, expectedAddress, "Address was " + address + ", expected " + expectedAddress);
 
-        String dnsName = subjectLocality.getDNSName();
+        final String dnsName = subjectLocality.getDNSName();
         Assert.assertEquals(dnsName, expectedDNSName, "DNSName was " + dnsName + ", expected " + expectedDNSName);
     }
 
@@ -84,8 +86,8 @@ public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, SubjectLocality.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        SubjectLocality subjectLocality = (SubjectLocality) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, SubjectLocality.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final SubjectLocality subjectLocality = (SubjectLocality) buildXMLObject(qname);
 
         subjectLocality.setAddress(expectedAddress);
         subjectLocality.setDNSName(expectedDNSName);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
index e56b56eda..2defddd30 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/SubjectTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.SubjectImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SubjectTest extends XMLObjectProviderBaseTestCase {
 
     /** Count of SubjectConfirmation subelements */
@@ -44,7 +45,7 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Subject subject = (Subject) unmarshallElement(singleElementFile);
+        final Subject subject = (Subject) unmarshallElement(singleElementFile);
 
         Assert.assertNotNull(subject);
     }
@@ -58,8 +59,8 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Subject subject = (Subject) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Subject subject = (Subject) buildXMLObject(qname);
 
         assertXMLEquals(expectedDOM, subject);
     }
@@ -73,7 +74,8 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Subject subject = (Subject) unmarshallElement(childElementsFile);
+        final Subject subject = (Subject) unmarshallElement(childElementsFile);
+        assert subject!=null;
         Assert.assertNotNull(subject.getNameID(), "Identifier element not present");
         Assert.assertEquals(subject
                 .getSubjectConfirmations().size(), expectedSubjectConfirmationCount, "SubjectConfirmation Count not as expected");
@@ -82,13 +84,13 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-        Subject subject = (Subject) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20_NS, Subject.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final Subject subject = (Subject) buildXMLObject(qname);
 
-        QName nameIDQName = new QName(SAMLConstants.SAML20_NS, NameID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName nameIDQName = new QName(SAMLConstants.SAML20_NS, NameID.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         subject.setNameID((NameID) buildXMLObject(nameIDQName));
         
-        QName subjectConfirmationQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
+        final QName subjectConfirmationQName = new QName(SAMLConstants.SAML20_NS, SubjectConfirmation.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
         for (int i = 0; i < expectedSubjectConfirmationCount; i++) {
             subject.getSubjectConfirmations().add((SubjectConfirmation) buildXMLObject(subjectConfirmationQName));
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
index 2209ec673..6e0879ba7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/TerminateTest.java
@@ -28,6 +28,7 @@ import org.opensaml.saml.saml2.core.Terminate;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class TerminateTest extends XMLObjectProviderBaseTestCase {
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
index 458372579..f0595993a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ComplexEncryptionTest.java
@@ -54,6 +54,7 @@ import com.google.common.base.Strings;
  * Tests for encryption using single and multicast key encryption keys, 
  * and peer vs. inline key placement.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ComplexEncryptionTest extends XMLObjectBaseTestCase {
     
     private Encrypter encrypter;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
index bb85e18c3..8279a5679 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/DecryptionPlusSigningTest.java
@@ -63,6 +63,7 @@ import org.w3c.dom.Element;
 /**
  *  Tests that decryption of an Assertion does not invalidate the signature of a containing object (Response).
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class DecryptionPlusSigningTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver keyResolver;
@@ -186,7 +187,7 @@ public class DecryptionPlusSigningTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of EncryptedAssertion: " + e);
         }
         
-        Assert.assertNotNull(decryptedAssertion, "Decrypted Assertion was null");
+        assert decryptedAssertion!=null;
         
         assertXMLEquals(targetDOM, decryptedAssertion);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ECDHTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ECDHTest.java
index b72631e7a..a42e65b4d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ECDHTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/ECDHTest.java
@@ -91,7 +91,7 @@ import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.SerializeSupport;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class ECDHTest extends XMLObjectBaseTestCase {
     
     private String targetFile;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
index ba13a7963..2d6c28d34 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleDecryptionTest.java
@@ -55,6 +55,7 @@ import net.shibboleth.shared.xml.XMLParserException;
 /**
  * Simple tests for SAML 2 decrypter, using a hardcoded key (so not testing complex encrypted key resolution, etc).
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
     
     private KeyInfoCredentialResolver keyResolver;
@@ -110,7 +111,7 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of encrypted SAML 2 type to element: " + e);
         }
         
-        Assert.assertNotNull(decryptedTarget, "Decrypted target was null");
+        assert decryptedTarget != null;
         Assert.assertTrue(decryptedTarget instanceof Assertion, "Decrypted target was not the expected type");
         
         assertXMLEquals(targetDOM, decryptedTarget);
@@ -129,9 +130,9 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
         
         final Assertion target = (Assertion) unmarshallElement(filename);
         assert target != null;
-        EncryptedID encryptedTarget = encrypter.encryptAsID(target);
+        final EncryptedID encryptedTarget = encrypter.encryptAsID(target);
         
-        Decrypter decrypter = new Decrypter(keyResolver, null, null);
+        final Decrypter decrypter = new Decrypter(keyResolver, null, null);
         
         SAMLObject decryptedTarget = null;
         try {
@@ -140,7 +141,7 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of encrypted SAML 2 type to element: " + e);
         }
         
-        Assert.assertNotNull(decryptedTarget, "Decrypted target was null");
+        assert decryptedTarget != null;
         Assert.assertTrue(decryptedTarget instanceof Assertion, "Decrypted target was not the expected type");
         
         assertXMLEquals(targetDOM, decryptedTarget);
@@ -170,7 +171,7 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of encrypted SAML 2 type to element: " + e);
         }
         
-        Assert.assertNotNull(decryptedTarget, "Decrypted target was null");
+        assert decryptedTarget != null;
         Assert.assertTrue(decryptedTarget instanceof NameID, "Decrypted target was not the expected type");
         
         assertXMLEquals(targetDOM, decryptedTarget);
@@ -200,7 +201,7 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of encrypted SAML 2 type to element: " + e);
         }
         
-        Assert.assertNotNull(decryptedTarget, "Decrypted target was null");
+        assert decryptedTarget != null;
         Assert.assertTrue(decryptedTarget instanceof NewID, "Decrypted target was not the expected type");
         
         assertXMLEquals(targetDOM, decryptedTarget);
@@ -230,7 +231,7 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
             Assert.fail("Error on decryption of encrypted SAML 2 type to element: " + e);
         }
         
-        Assert.assertNotNull(decryptedTarget, "Decrypted target was null");
+        assert decryptedTarget != null;
         Assert.assertTrue(decryptedTarget instanceof Attribute, "Decrypted target was not the expected type");
         
         assertXMLEquals(targetDOM, decryptedTarget);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
index f4cebd8a5..a7f9dd6bc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/SimpleEncryptionTest.java
@@ -51,6 +51,7 @@ import com.google.common.base.Strings;
 /**
  * Simple tests for encryption.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
     
     private Encrypter encrypter;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/XMLSecurityTestingSupport.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/XMLSecurityTestingSupport.java
index b79129a57..62e5629dc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/XMLSecurityTestingSupport.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/tests/XMLSecurityTestingSupport.java
@@ -34,6 +34,7 @@ import org.opensaml.xmlsec.keyinfo.impl.provider.RSAKeyValueProvider;
  * 
  * <p>This was copied from -xmlsec-impl to pull a test-jar dependency.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public final class XMLSecurityTestingSupport {
     
     private XMLSecurityTestingSupport() { }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
index ef3510f23..78c893515 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AdditionalMetadataLocationImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AdditionalMetadataLocationTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected value of namespace attribute */
@@ -51,19 +52,20 @@ public class AdditionalMetadataLocationTest extends XMLObjectProviderBaseTestCas
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AdditionalMetadataLocation locationObj = (AdditionalMetadataLocation) unmarshallElement(singleElementFile);
+        final AdditionalMetadataLocation locationObj = (AdditionalMetadataLocation) unmarshallElement(singleElementFile);
+        assert locationObj!=null;
 
-        String location = locationObj.getURI();
+        final String location = locationObj.getURI();
         Assert.assertEquals(location, expectedContent, "Location URI was " + location + ", expected " + expectedContent);
 
-        String namespace = locationObj.getNamespaceURI();
+        final String namespace = locationObj.getNamespaceURI();
         Assert.assertEquals(namespace, expectedNamespace, "Namepsace URI was " + namespace + ", expected " + expectedNamespace);
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        AdditionalMetadataLocation location = (new AdditionalMetadataLocationBuilder()).buildObject(); 
+        final AdditionalMetadataLocation location = (new AdditionalMetadataLocationBuilder()).buildObject(); 
         location.setURI(expectedContent);
         location.setNamespaceURI(expectedNamespace);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
index 5d62645d8..4760f47a7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.AffiliateMember;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AffiliateMemberImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AffiliateMemberTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedMemberID;
@@ -46,20 +47,20 @@ public class AffiliateMemberTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AffiliateMember member = (AffiliateMember)unmarshallElement(singleElementFile);
-        
-        String memberID = member.getURI();
+        final AffiliateMember member = (AffiliateMember)unmarshallElement(singleElementFile);
+        assert member!=null;
+        final String memberID = member.getURI();
         Assert.assertEquals(memberID, expectedMemberID, "Affiliation memeber ID was " + memberID + ", expected " + expectedMemberID);
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliateMember.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliateMember.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         
         AffiliateMember member = buildXMLObject(qname);
         
-        StringBuilder stringBuilder = new StringBuilder();
+        final StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < 1026; i++) {
             stringBuilder.append(i);
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
index 0c7e404ab..cd8ddfa64 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
@@ -42,6 +42,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AffiliationDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected affiliationOwnerID value */
@@ -82,16 +83,17 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementFile);
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementFile);
+        assert descriptor!=null;
 
-        String ownerId = descriptor.getOwnerID();
+        final String ownerId = descriptor.getOwnerID();
         Assert.assertEquals(ownerId,
                 expectedOwnerID, "entityID attribute has a value of " + ownerId + ", expected a value of " + expectedOwnerID);
 
-        Duration duration = descriptor.getCacheDuration();
+        final Duration duration = descriptor.getCacheDuration();
         Assert.assertNull(duration, "cacheDuration attribute has a value of " + duration + ", expected no value");
 
-        Instant validUntil = descriptor.getValidUntil();
+        final Instant validUntil = descriptor.getValidUntil();
         Assert.assertNull(validUntil, "validUntil attribute has a value of " + validUntil + ", expected no value");
         
         Assert.assertTrue(descriptor.isValid());
@@ -100,20 +102,20 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
-        String ownerId = descriptor.getOwnerID();
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert descriptor!=null;
+        final String ownerId = descriptor.getOwnerID();
         Assert.assertEquals(ownerId,
                 expectedOwnerID, "entityID attribute has a value of " + ownerId + ", expected a value of " + expectedOwnerID);
 
-        String id = descriptor.getID();
+        final String id = descriptor.getID();
         Assert.assertEquals(id, expectedID, "ID attribute has a value of " + id + ", expected a value of " + expectedID);
 
-        Duration duration = descriptor.getCacheDuration();
+        final Duration duration = descriptor.getCacheDuration();
         Assert.assertEquals(duration, expectedCacheDuration, "cacheDuration attribute has a value of " + duration + ", expected a value of "
                         + expectedCacheDuration);
 
-        Instant validUntil = descriptor.getValidUntil();
+        final Instant validUntil = descriptor.getValidUntil();
         Assert.assertEquals(expectedValidUntil
                 .compareTo(validUntil), 0, "validUntil attribute value did not match expected value");
         Assert.assertFalse(descriptor.isValid());
@@ -121,8 +123,9 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementUnknownAttributesFile);
-        AttributeMap attributes = descriptor.getUnknownAttributes();
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(singleElementUnknownAttributesFile);
+        assert descriptor!=null;
+        final  AttributeMap attributes = descriptor.getUnknownAttributes();
 
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
         for (int i = 0; i < unknownAttributeNames.length; i++) {
@@ -133,8 +136,8 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(childElementsFile);
-
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) unmarshallElement(childElementsFile);
+        assert descriptor!=null;
         Assert.assertNotNull(descriptor.getExtensions(), "Extensions");
         Assert.assertNotNull(descriptor.getSignature(), "Signature");
         Assert.assertEquals(descriptor.getKeyDescriptors().size(), 1, "KeyDescriptor count");
@@ -144,9 +147,9 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliationDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliationDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20MD_PREFIX);
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) buildXMLObject(qname);
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) buildXMLObject(qname);
 
         descriptor.setOwnerID(expectedOwnerID);
 
@@ -161,7 +164,7 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(AffiliationDescriptor.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(AffiliationDescriptor.DEFAULT_ELEMENT_NAME);
 
         ((AffiliationDescriptor)target).setID("id123");
 
@@ -172,7 +175,7 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        AffiliationDescriptor descriptor = (new AffiliationDescriptorBuilder()).buildObject();
+        final AffiliationDescriptor descriptor = (new AffiliationDescriptorBuilder()).buildObject();
 
         descriptor.setOwnerID(expectedOwnerID);
         descriptor.setID(expectedID);
@@ -185,7 +188,7 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnknownAttributesMarshall() {
-        AffiliationDescriptor descriptor = (new AffiliationDescriptorBuilder()).buildObject();
+        final AffiliationDescriptor descriptor = (new AffiliationDescriptorBuilder()).buildObject();
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             descriptor.getUnknownAttributes().put(unknownAttributeNames[i], unknownAttributeValues[i]);
@@ -195,9 +198,9 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliationDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, AffiliationDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20MD_PREFIX);
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) buildXMLObject(qname);
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) buildXMLObject(qname);
 
         StringBuilder bigString = new StringBuilder();
         for (int i=0; i < 1026; i++) {
@@ -216,7 +219,7 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
 
         descriptor.setExtensions((Extensions) buildXMLObject(Extensions.DEFAULT_ELEMENT_NAME));
 
-        QName affilMemberQName = new QName(SAMLConstants.SAML20MD_NS, AffiliateMember.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName affilMemberQName = new QName(SAMLConstants.SAML20MD_NS, AffiliateMember.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.getMembers().add((AffiliateMember) buildXMLObject(affilMemberQName));
         descriptor.getMembers().add((AffiliateMember) buildXMLObject(affilMemberQName));
         descriptor.getMembers().add((AffiliateMember) buildXMLObject(affilMemberQName));
@@ -231,7 +234,7 @@ public class AffiliationDescriptorTest extends XMLObjectProviderBaseTestCase {
      * @return minimally populated Signature element
      */
     private Signature buildSignatureSkeleton() {
-        Signature signature = (Signature) buildXMLObject(Signature.DEFAULT_ELEMENT_NAME);
+        final Signature signature = (Signature) buildXMLObject(Signature.DEFAULT_ELEMENT_NAME);
         signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
         signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
         return signature;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
index 9dc189821..b03f4f27e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.metadata.ArtifactResolutionService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.ArtifactResolutionServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ArtifactResolutionServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -59,8 +60,8 @@ public class ArtifactResolutionServiceTest extends XMLObjectProviderBaseTestCase
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        ArtifactResolutionService service = (ArtifactResolutionService) unmarshallElement(singleElementFile);
-        
+        final ArtifactResolutionService service = (ArtifactResolutionService) unmarshallElement(singleElementFile);
+        assert service!=null; 
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
@@ -69,8 +70,8 @@ public class ArtifactResolutionServiceTest extends XMLObjectProviderBaseTestCase
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        ArtifactResolutionService service = (ArtifactResolutionService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final ArtifactResolutionService service = (ArtifactResolutionService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
@@ -103,32 +104,4 @@ public class ArtifactResolutionServiceTest extends XMLObjectProviderBaseTestCase
 
         assertXMLEquals(expectedOptionalAttributesDOM, service);
     }
-    
-    /**
-     * Test the proper behavior of the XSBooleanValue attributes.
-     */
-    @Test
-    public void testXSBooleanAttributes() {
-        ArtifactResolutionService ars = 
-            (ArtifactResolutionService) buildXMLObject(ArtifactResolutionService.DEFAULT_ELEMENT_NAME);
-        
-        // isDefault attribute
-        ars.setIsDefault(Boolean.TRUE);
-        Assert.assertEquals(ars.isDefault(), Boolean.TRUE, "Unexpected value for boolean attribute found");
-        Assert.assertNotNull(ars.isDefaultXSBoolean(), "XSBooleanValue was null");
-        Assert.assertEquals(ars.isDefaultXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
-                "XSBooleanValue was unexpected value");
-        Assert.assertEquals(ars.isDefaultXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
-        
-        ars.setIsDefault(Boolean.FALSE);
-        Assert.assertEquals(ars.isDefault(), Boolean.FALSE, "Unexpected value for boolean attribute found");
-        Assert.assertNotNull(ars.isDefaultXSBoolean(), "XSBooleanValue was null");
-        Assert.assertEquals(ars.isDefaultXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
-                "XSBooleanValue was unexpected value");
-        Assert.assertEquals(ars.isDefaultXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
-        
-        ars.setIsDefault((Boolean) null);
-        Assert.assertEquals(ars.isDefault(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
-        Assert.assertNull(ars.isDefaultXSBoolean(), "XSBooleanValue was not null");
-    }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
index fa7b789d1..20b1ca198 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceTest.java
@@ -20,17 +20,18 @@
  */
 package org.opensaml.saml.saml2.metadata.impl;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
 import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
 import org.opensaml.core.xml.schema.XSBooleanValue;
 import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionConsumerServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -60,7 +61,7 @@ public class AssertionConsumerServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementUnmarshall() {
         AssertionConsumerService service = (AssertionConsumerService) unmarshallElement(singleElementFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
@@ -70,7 +71,7 @@ public class AssertionConsumerServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         AssertionConsumerService service = (AssertionConsumerService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
@@ -118,14 +119,18 @@ public class AssertionConsumerServiceTest extends XMLObjectProviderBaseTestCase
         Assert.assertNotNull(acs.isDefaultXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(acs.isDefaultXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(acs.isDefaultXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool = acs.isDefaultXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         acs.setIsDefault(Boolean.FALSE);
         Assert.assertEquals(acs.isDefault(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(acs.isDefaultXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(acs.isDefaultXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(acs.isDefaultXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool = acs.isDefaultXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
         
         acs.setIsDefault((Boolean) null);
         Assert.assertEquals(acs.isDefault(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
index 010764f5f..1e4660a27 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.AssertionIDRequestService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AssertionIDRequestServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AssertionIDRequestServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -55,6 +56,7 @@ public class AssertionIDRequestServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementUnmarshall() {
         AssertionIDRequestService service = (AssertionIDRequestService) unmarshallElement(singleElementFile);
+        assert service!=null;
         
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
@@ -64,7 +66,7 @@ public class AssertionIDRequestServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         AssertionIDRequestService service = (AssertionIDRequestService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
index 37d8b8696..3519c0956 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AttributeAuthorityDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /**
@@ -47,7 +48,7 @@ public class AttributeAuthorityDescriptorTest extends XMLObjectProviderBaseTestC
     @Test
     public void testSingleElementUnmarshall() {
         AttributeAuthorityDescriptor descriptor = (AttributeAuthorityDescriptor) unmarshallElement(singleElementFile);
-
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getAttributeServices().size(), 0);
         Assert.assertEquals(descriptor.getAssertionIDRequestServices().size(), 0);
         Assert.assertEquals(descriptor.getNameIDFormats().size(), 0);
@@ -60,7 +61,7 @@ public class AttributeAuthorityDescriptorTest extends XMLObjectProviderBaseTestC
     @Test
     public void testChildElementsUnmarshall() {
         AttributeAuthorityDescriptor descriptor = (AttributeAuthorityDescriptor) unmarshallElement(childElementsFile);
-
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getAttributeServices().size(), 1);
         Assert.assertEquals(descriptor.getAssertionIDRequestServices().size(), 2);
         Assert.assertEquals(descriptor.getNameIDFormats().size(), 1);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
index e28e0dd28..5cf8b6afb 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.metadata.ServiceName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected int expectedIndex;
@@ -62,7 +63,7 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementUnmarshall() {
         AttributeConsumingService service = (AttributeConsumingService) unmarshallElement(singleElementFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
     }
 
@@ -70,7 +71,7 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         AttributeConsumingService service = (AttributeConsumingService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getIndex(), expectedIndex, "Index was not expected value");
         Assert.assertEquals(service.isDefaultXSBoolean(), expectedIsDefault, "isDefault was not expected value");
     }
@@ -80,7 +81,7 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
     @Test
     public void testChildElementsUnmarshall(){
         AttributeConsumingService service = (AttributeConsumingService) unmarshallElement(childElementsFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getNames().size(), expectedServiceNameCount, "<ServiceName> count");
         Assert.assertEquals(service.getDescriptions().size(), expectedServiceDecsriptionCount, "<ServiceDescription> count");
         Assert.assertEquals(service.getRequestedAttributes().size(), expectedRequestedAttributeCount, "<ReqestAttribute> count");
@@ -144,14 +145,18 @@ public class AttributeConsumingServiceTest extends XMLObjectProviderBaseTestCase
         Assert.assertNotNull(acs.isDefaultXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(acs.isDefaultXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(acs.isDefaultXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool = acs.isDefaultXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         acs.setIsDefault(Boolean.FALSE);
         Assert.assertEquals(acs.isDefault(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(acs.isDefaultXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(acs.isDefaultXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(acs.isDefaultXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool = acs.isDefaultXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
         
         acs.setIsDefault((Boolean) null);
         Assert.assertEquals(acs.isDefault(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
index 5f30ac630..3c1aed5d2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AttributeProfileImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeProfileTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected ProfileURI */
@@ -48,7 +49,7 @@ public class AttributeProfileTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall(){
         AttributeProfile profile = (AttributeProfile) unmarshallElement(singleElementFile);
-        
+        assert profile!=null;        
         Assert.assertEquals(profile.getURI(), expectedProfileURI);
     }
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
index c956cf2bb..65f8b6d8b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceTest.java
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml2.metadata.AttributeService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AttributeServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AttributeServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -57,8 +58,8 @@ public class AttributeServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AttributeService service = (AttributeService) unmarshallElement(singleElementFile);
-        
+        final AttributeService service = (AttributeService) unmarshallElement(singleElementFile);
+        assert service!=null;        
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
@@ -66,8 +67,8 @@ public class AttributeServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AttributeService service = (AttributeService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final AttributeService service = (AttributeService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;                
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
@@ -76,7 +77,7 @@ public class AttributeServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        AttributeService service = (new AttributeServiceBuilder()).buildObject();
+        final AttributeService service = (new AttributeServiceBuilder()).buildObject();
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -87,8 +88,8 @@ public class AttributeServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, AttributeService.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-        AttributeService service = (AttributeService) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, AttributeService.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final AttributeService service = (AttributeService) buildXMLObject(qname);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
index fe14113ef..dca9fa410 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
@@ -43,6 +43,7 @@ import org.opensaml.saml.saml2.metadata.Organization;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AuthnAuthorityDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected supported protocol enumeration */
@@ -100,40 +101,40 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnmarshall() {
-        AuthnAuthorityDescriptor authnAuthorityObj = (AuthnAuthorityDescriptor) unmarshallElement(singleElementFile);
-
-        List<String> protoEnum = authnAuthorityObj.getSupportedProtocols();
+        final AuthnAuthorityDescriptor authnAuthorityObj = (AuthnAuthorityDescriptor) unmarshallElement(singleElementFile);
+        assert authnAuthorityObj!=null;
+        final List<String> protoEnum = authnAuthorityObj.getSupportedProtocols();
         Assert.assertEquals(protoEnum, expectedSupportedProtocols,
                 "Supported protocol enumeration was not equal to expected enumeration");
 
-        Duration duration = authnAuthorityObj.getCacheDuration();
+        final Duration duration = authnAuthorityObj.getCacheDuration();
         Assert.assertNull(duration, "cacheDuration attribute has a value of " + duration + ", expected no value");
 
-        Instant validUntil = authnAuthorityObj.getValidUntil();
+        final Instant validUntil = authnAuthorityObj.getValidUntil();
         Assert.assertNull(validUntil, "validUntil attribute has a value of " + validUntil + ", expected no value");
 
-        String errorURL = authnAuthorityObj.getErrorURL();
+        final String errorURL = authnAuthorityObj.getErrorURL();
         Assert.assertNull(errorURL, "errorURL attribute has a value of " + errorURL + ", expected no value");
     }
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthnAuthorityDescriptor authnAuthorityObj =
+        final AuthnAuthorityDescriptor authnAuthorityObj =
                 (AuthnAuthorityDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
-        List<String> protoEnum = authnAuthorityObj.getSupportedProtocols();
+        assert authnAuthorityObj!=null;
+        final  List<String> protoEnum = authnAuthorityObj.getSupportedProtocols();
         Assert.assertEquals(protoEnum, expectedSupportedProtocols,
                 "Supported protocol enumeration was not equal to expected enumeration");
 
-        Duration duration = authnAuthorityObj.getCacheDuration();
+        final Duration duration = authnAuthorityObj.getCacheDuration();
         Assert.assertEquals(duration, expectedCacheDuration, "cacheDuration attribute has a value of " + duration
                 + ", expected a value of " + expectedCacheDuration);
 
-        Instant validUntil = authnAuthorityObj.getValidUntil();
+        final Instant validUntil = authnAuthorityObj.getValidUntil();
         Assert.assertEquals(expectedValidUntil.compareTo(validUntil), 0,
                 "validUntil attribute value did not match expected value");
 
-        String errorURL = authnAuthorityObj.getErrorURL();
+        final String errorURL = authnAuthorityObj.getErrorURL();
         Assert.assertEquals(errorURL, expectedErrorURL, "errorURL attribute has a value of " + errorURL
                 + ", expected a value of " + expectedErrorURL);
     }
@@ -141,8 +142,8 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
     /** {@inheritDoc} */
 
     @Test public void testChildElementsUnmarshall() {
-        AuthnAuthorityDescriptor authnAuthorityObj = (AuthnAuthorityDescriptor) unmarshallElement(childElementsFile);
-
+        final AuthnAuthorityDescriptor authnAuthorityObj = (AuthnAuthorityDescriptor) unmarshallElement(childElementsFile);
+        assert authnAuthorityObj!=null;
         Assert.assertNotNull(authnAuthorityObj.getExtensions(), "<Extensions>");
         Assert.assertEquals(authnAuthorityObj.getKeyDescriptors().size(), 0, "KeyDescriptor");
 
@@ -168,7 +169,7 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
 
     /** {@inheritDoc} */
     @Test public void testSingleElementMarshall() {
-        AuthnAuthorityDescriptor descriptor = (new AuthnAuthorityDescriptorBuilder()).buildObject();
+        final AuthnAuthorityDescriptor descriptor = (new AuthnAuthorityDescriptorBuilder()).buildObject();
 
         descriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
 
@@ -177,7 +178,7 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesMarshall() {
-        AuthnAuthorityDescriptor descriptor = (new AuthnAuthorityDescriptorBuilder()).buildObject();
+        final AuthnAuthorityDescriptor descriptor = (new AuthnAuthorityDescriptorBuilder()).buildObject();
 
         descriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
         descriptor.setValidUntil(expectedValidUntil);
@@ -190,37 +191,37 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
     /** {@inheritDoc} */
 
     @Test public void testChildElementsMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, AuthnAuthorityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        AuthnAuthorityDescriptor descriptor = (AuthnAuthorityDescriptor) buildXMLObject(qname);
+        final AuthnAuthorityDescriptor descriptor = (AuthnAuthorityDescriptor) buildXMLObject(qname);
 
         descriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
-        QName orgQName =
+        final QName orgQName =
                 new QName(SAMLConstants.SAML20MD_NS, Organization.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.setOrganization((Organization) buildXMLObject(orgQName));
 
-        QName contactPersonQName =
+        final QName contactPersonQName =
                 new QName(SAMLConstants.SAML20MD_NS, ContactPerson.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < expectedContactPersons; i++) {
             descriptor.getContactPersons().add((ContactPerson) buildXMLObject(contactPersonQName));
         }
 
-        QName authnQueryServiceQName =
+        final QName authnQueryServiceQName =
                 new QName(SAMLConstants.SAML20MD_NS, AuthnQueryService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < expectedAuthnQueryServices; i++) {
             descriptor.getAuthnQueryServices().add((AuthnQueryService) buildXMLObject(authnQueryServiceQName));
         }
 
-        QName assertionIDRequestServiceQName =
+        final QName assertionIDRequestServiceQName =
                 new QName(SAMLConstants.SAML20MD_NS, AssertionIDRequestService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < expectedAssertionIdRequestServices; i++) {
@@ -228,7 +229,7 @@ public class AuthnAuthorityDescriptorTest extends XMLObjectProviderBaseTestCase
                     (AssertionIDRequestService) buildXMLObject(assertionIDRequestServiceQName));
         }
 
-        QName nameIDFormatQName =
+        final QName nameIDFormatQName =
                 new QName(SAMLConstants.SAML20MD_NS, NameIDFormat.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < expectedNameIdFormats; i++) {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
index 399b4e6c8..a772ac709 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.AuthnQueryService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AuthnQueryServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthnQueryServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -54,8 +55,8 @@ public class AuthnQueryServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        AuthnQueryService service = (AuthnQueryService) unmarshallElement(singleElementFile);
-        
+        final AuthnQueryService service = (AuthnQueryService) unmarshallElement(singleElementFile);
+        assert service!=null;        
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
@@ -63,8 +64,8 @@ public class AuthnQueryServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        AuthnQueryService service = (AuthnQueryService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final AuthnQueryService service = (AuthnQueryService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;        
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
@@ -73,7 +74,7 @@ public class AuthnQueryServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        AuthnQueryService service = (new AuthnQueryServiceBuilder()).buildObject();
+        final AuthnQueryService service = (new AuthnQueryServiceBuilder()).buildObject();
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -84,7 +85,7 @@ public class AuthnQueryServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        AuthnQueryService service = (AuthnQueryService) buildXMLObject(AuthnQueryService.DEFAULT_ELEMENT_NAME);
+        final AuthnQueryService service = (AuthnQueryService) buildXMLObject(AuthnQueryService.DEFAULT_ELEMENT_NAME);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
index a645b7a89..309d6c788 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.AuthzService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.AuthzServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class AuthzServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -55,7 +56,7 @@ public class AuthzServiceTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall() {
         AuthzService service = (AuthzService) unmarshallElement(singleElementFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
@@ -64,7 +65,7 @@ public class AuthzServiceTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         AuthzService service = (AuthzService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
index b51e8db70..4953cb57f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/CompanyTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.Company;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.CompanyImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class CompanyTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected company name */
@@ -50,15 +51,15 @@ public class CompanyTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Company company = (Company) unmarshallElement(singleElementFile);
-        
+        final Company company = (Company) unmarshallElement(singleElementFile);
+        assert company!=null;
         Assert.assertEquals(company.getValue(), expectedName, "Company name was not expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        Company company = (new CompanyBuilder()).buildObject();
+        final Company company = (new CompanyBuilder()).buildObject();
         
         company.setValue(expectedName);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
index f84d00389..d29674ede 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
@@ -38,6 +38,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.ContactPersonImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected company name */
@@ -71,14 +72,15 @@ public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        ContactPerson person = (ContactPerson) unmarshallElement(singleElementFile);
-        
+        final ContactPerson person = (ContactPerson) unmarshallElement(singleElementFile);
+        assert person!=null;
         Assert.assertEquals(person.getType(), expectedPersonType, "Contact type was not expected value");
     }
     
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        ContactPerson person = (ContactPerson) unmarshallElement(singleElementUnknownAttributesFile);
+        final ContactPerson person = (ContactPerson) unmarshallElement(singleElementUnknownAttributesFile);
+        assert person!=null;
         AttributeMap attributes = person.getUnknownAttributes();
 
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
@@ -91,8 +93,8 @@ public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testChildElementsUnmarshall()
     {
-        ContactPerson person = (ContactPerson) unmarshallElement(childElementsFile);
-        
+        final ContactPerson person = (ContactPerson) unmarshallElement(childElementsFile);
+        assert person!=null;
         Assert.assertNotNull(person.getExtensions(), "Extension Element not present");
         Assert.assertNotNull(person.getCompany(), "Company Element not present");
         Assert.assertNotNull(person.getSurName(), "SurName not present");
@@ -104,7 +106,7 @@ public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        ContactPerson person = (ContactPerson) buildXMLObject(ContactPerson.DEFAULT_ELEMENT_NAME);
+        final ContactPerson person = (ContactPerson) buildXMLObject(ContactPerson.DEFAULT_ELEMENT_NAME);
         
         person.setType(expectedPersonType);
 
@@ -114,7 +116,7 @@ public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnknownAttributesMarshall() {
-        ContactPerson person = (ContactPerson) buildXMLObject(ContactPerson.DEFAULT_ELEMENT_NAME);
+        final ContactPerson person = (ContactPerson) buildXMLObject(ContactPerson.DEFAULT_ELEMENT_NAME);
         person.setType(ContactPersonTypeEnumeration.OTHER);
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
@@ -127,28 +129,28 @@ public class ContactPersonTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testChildElementsMarshall()
     {
-        ContactPerson person = (new ContactPersonBuilder()).buildObject();
+        final ContactPerson person = (new ContactPersonBuilder()).buildObject();
         
         person.setType(expectedPersonType);
 
-        QName extensionsQName = new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final  QName extensionsQName = new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         person.setExtensions((Extensions) buildXMLObject(extensionsQName));
         
-        QName companuQName = new QName(SAMLConstants.SAML20MD_NS, Company.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName companuQName = new QName(SAMLConstants.SAML20MD_NS, Company.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         person.setCompany((Company) buildXMLObject(companuQName));
         
-        QName givenNameQName = new QName(SAMLConstants.SAML20MD_NS, GivenName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName givenNameQName = new QName(SAMLConstants.SAML20MD_NS, GivenName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         person.setGivenName((GivenName) buildXMLObject(givenNameQName));
         
-        QName surnameQName = new QName(SAMLConstants.SAML20MD_NS, SurName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName surnameQName = new QName(SAMLConstants.SAML20MD_NS, SurName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         person.setSurName((SurName) buildXMLObject(surnameQName));
         
-        QName teleQName = new QName(SAMLConstants.SAML20MD_NS, TelephoneNumber.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName teleQName = new QName(SAMLConstants.SAML20MD_NS, TelephoneNumber.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < telephoneNumberCount; i++) {
             person.getTelephoneNumbers().add((TelephoneNumber) buildXMLObject(teleQName));
         }
         
-        QName emailQName = new QName(SAMLConstants.SAML20MD_NS, EmailAddress.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final QName emailQName = new QName(SAMLConstants.SAML20MD_NS, EmailAddress.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < emailAddressCount; i++) {
             person.getEmailAddresses().add((EmailAddress) buildXMLObject(emailQName));
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
index ba4225408..6aab65a29 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.EmailAddress;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.EmailAddressImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EmailAddressTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected email address */
@@ -50,8 +51,8 @@ public class EmailAddressTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EmailAddress address = (EmailAddress) unmarshallElement(singleElementFile);
-        
+        final EmailAddress address = (EmailAddress) unmarshallElement(singleElementFile);
+        assert address!=null;
         Assert.assertEquals(address.getURI(), expectedAddress, "Email address was not expected value");
     }
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
index 27f08f3de..1d53db5df 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
@@ -30,6 +30,7 @@ import org.opensaml.xmlsec.signature.DigestMethod;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     
     private String expectedAlgorithm;
@@ -54,8 +55,8 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EncryptionMethod em = (EncryptionMethod) unmarshallElement(singleElementFile);
-        
+        final EncryptionMethod em = (EncryptionMethod) unmarshallElement(singleElementFile);
+        assert em!=null;        
         Assert.assertNotNull(em, "EncryptionMethod");
         Assert.assertEquals(em.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
         Assert.assertNull(em.getKeySize(), "KeySize child");
@@ -66,9 +67,8 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        EncryptionMethod em = (EncryptionMethod) unmarshallElement(childElementsFile);
-        
-        Assert.assertNotNull(em, "EncryptionMethod");
+        final EncryptionMethod em = (EncryptionMethod) unmarshallElement(childElementsFile);
+        assert em!=null;
         Assert.assertEquals(em.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
         Assert.assertNotNull(em.getKeySize(), "KeySize child");
         Assert.assertNotNull(em.getOAEPparams(), "OAEPparams child");
@@ -78,7 +78,7 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
+        final EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
         
         em.setAlgorithm(expectedAlgorithm);
         
@@ -88,7 +88,7 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        EncryptionMethod em = (new EncryptionMethodBuilder()).buildObject();
+        final EncryptionMethod em = (new EncryptionMethodBuilder()).buildObject();
         
         em.setAlgorithm(expectedAlgorithm);
         em.setKeySize((KeySize) buildXMLObject(KeySize.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
index e525fe056..d91865a49 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorTest.java
@@ -41,6 +41,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.EntitiesDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EntitiesDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Name attribute value */
@@ -83,15 +84,15 @@ public class EntitiesDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        EntitiesDescriptor entitiesDescriptorObj = (EntitiesDescriptor) unmarshallElement(singleElementFile);
-
-        String name = entitiesDescriptorObj.getName();
+        final EntitiesDescriptor entitiesDescriptorObj = (EntitiesDescriptor) unmarshallElement(singleElementFile);
+        assert entitiesDescriptorObj!=null;
+        final String name = entitiesDescriptorObj.getName();
         Assert.assertNull(name, "Name attribute has a value of " + name + ", expected no value");
 
-        Duration duration = entitiesDescriptorObj.getCacheDuration();
+        final Duration duration = entitiesDescriptorObj.getCacheDuration();
         Assert.assertNull(duration, "cacheDuration attribute has a value of " + duration + ", expected no value");
 
-        Instant validUntil = entitiesDescriptorObj.getValidUntil();
+        final Instant validUntil = entitiesDescriptorObj.getValidUntil();
         Assert.assertNull(validUntil, "validUntil attribute has a value of " + validUntil + ", expected no value");
         Assert.assertTrue(entitiesDescriptorObj.isValid());
     }
@@ -99,20 +100,20 @@ public class EntitiesDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        EntitiesDescriptor entitiesDescriptorObj = (EntitiesDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
-        String name = entitiesDescriptorObj.getName();
+        final EntitiesDescriptor entitiesDescriptorObj = (EntitiesDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert entitiesDescriptorObj!=null;
+        final String name = entitiesDescriptorObj.getName();
         Assert.assertEquals(name, expectedName,
                 "Name attribute has a value of " + name + ", expected a value of " + expectedName);
 
-        String id = entitiesDescriptorObj.getID();
+        final String id = entitiesDescriptorObj.getID();
         Assert.assertEquals(id, expectedID, "ID attriubte has a value of " + id + ", expected a value of " + expectedID);
 
-        Duration duration = entitiesDescriptorObj.getCacheDuration();
+        final Duration duration = entitiesDescriptorObj.getCacheDuration();
         Assert.assertEquals(duration, expectedCacheDuration, "cacheDuration attribute has a value of " + duration + ", expected a value of "
                         + expectedCacheDuration);
 
-        Instant validUntil = entitiesDescriptorObj.getValidUntil();
+        final Instant validUntil = entitiesDescriptorObj.getValidUntil();
         Assert.assertEquals(expectedValidUntil
                 .compareTo(validUntil), 0, "validUntil attribute value did not match expected value");
         Assert.assertFalse(entitiesDescriptorObj.isValid());
@@ -121,8 +122,8 @@ public class EntitiesDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) unmarshallElement(childElementsFile);
-
+        final EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) unmarshallElement(childElementsFile);
+        assert entitiesDescriptor!=null;
         Assert.assertNotNull(entitiesDescriptor.getSignature(), "Signature");
         Assert.assertNotNull(entitiesDescriptor.getExtensions(), "Extensions");
         Assert.assertEquals(entitiesDescriptor
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
index 36482e5e7..42199f322 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
@@ -51,6 +51,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.EntityDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected entityID value */
@@ -93,16 +94,16 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnmarshall() {
-        EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementFile);
-
-        String entityID = descriptor.getEntityID();
+        final EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementFile);
+        assert descriptor!=null;
+        final String entityID = descriptor.getEntityID();
         Assert.assertEquals(entityID, expectedEntityID, "entityID attribute has a value of " + entityID
                 + ", expected a value of " + expectedEntityID);
 
-        Duration duration = descriptor.getCacheDuration();
+        final Duration duration = descriptor.getCacheDuration();
         Assert.assertNull(duration, "cacheDuration attribute has a value of " + duration + ", expected no value");
 
-        Instant validUntil = descriptor.getValidUntil();
+        final Instant validUntil = descriptor.getValidUntil();
         Assert.assertNull(validUntil, "validUntil attribute has a value of " + validUntil + ", expected no value");
 
         Assert.assertTrue(descriptor.isValid());
@@ -110,20 +111,20 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesUnmarshall() {
-        EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
-        String entityID = descriptor.getEntityID();
+        final EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert descriptor!=null;
+        final String entityID = descriptor.getEntityID();
         Assert.assertEquals(entityID, expectedEntityID, "entityID attribute has a value of " + entityID
                 + ", expected a value of " + expectedEntityID);
 
-        String id = descriptor.getID();
+        final String id = descriptor.getID();
         Assert.assertEquals(id, expectedID, "ID attribute has a value of " + id + ", expected a value of " + expectedID);
 
-        Duration duration = descriptor.getCacheDuration();
+        final Duration duration = descriptor.getCacheDuration();
         Assert.assertEquals(duration, expectedCacheDuration, "cacheDuration attribute has a value of " + duration
                 + ", expected a value of " + expectedCacheDuration);
 
-        Instant validUntil = descriptor.getValidUntil();
+        final Instant validUntil = descriptor.getValidUntil();
         Assert.assertEquals(expectedValidUntil.compareTo(validUntil), 0,
                 "validUntil attribute value did not match expected value");
 
@@ -132,8 +133,9 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementUnknownAttributesFile);
-        AttributeMap attributes = descriptor.getUnknownAttributes();
+        final EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(singleElementUnknownAttributesFile);
+        assert descriptor!=null;
+        final AttributeMap attributes = descriptor.getUnknownAttributes();
 
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
         for (int i = 0; i < unknownAttributeNames.length; i++) {
@@ -143,8 +145,8 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(childElementsFile);
-
+        final EntityDescriptor descriptor = (EntityDescriptor) unmarshallElement(childElementsFile);
+        assert descriptor!=null;
         Assert.assertNotNull(descriptor.getExtensions(), "Extensions child");
         Assert.assertNotNull(descriptor.getSignature(), "Signature child");
         Assert.assertEquals(descriptor.getRoleDescriptors(IDPSSODescriptor.DEFAULT_ELEMENT_NAME).size(), 2,
@@ -191,10 +193,10 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, EntityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        EntityDescriptor descriptor = (EntityDescriptor) buildXMLObject(qname);
+        final EntityDescriptor descriptor = (EntityDescriptor) buildXMLObject(qname);
 
         StringBuilder bigString = new StringBuilder();
         for (int i = 0; i < 2000; i++ ) {
@@ -220,7 +222,7 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
      * */
     @Test
     public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
-        XMLObject target = buildXMLObject(EntityDescriptor.DEFAULT_ELEMENT_NAME);
+        final XMLObject target = buildXMLObject(EntityDescriptor.DEFAULT_ELEMENT_NAME);
 
         ((EntityDescriptor)target).setID("id123");
 
@@ -229,7 +231,7 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
 
     @Test public void testSingleElementUnknownAttributesMarshall() {
-        EntityDescriptor descriptor = (new EntityDescriptorBuilder()).buildObject();
+        final EntityDescriptor descriptor = (new EntityDescriptorBuilder()).buildObject();
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             descriptor.getUnknownAttributes().put(unknownAttributeNames[i], unknownAttributeValues[i]);
@@ -239,10 +241,10 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, EntityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        EntityDescriptor descriptor = (EntityDescriptor) buildXMLObject(qname);
+        final EntityDescriptor descriptor = (EntityDescriptor) buildXMLObject(qname);
 
         descriptor.setEntityID(expectedEntityID);
         descriptor.setID(expectedID);
@@ -254,29 +256,29 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, EntityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         EntityDescriptor descriptor = (EntityDescriptor) buildXMLObject(qname);
         descriptor.setID(expectedID);
         descriptor.setEntityID(expectedEntityID);
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
         descriptor.setSignature(buildSignatureSkeleton());
 
-        QName idpSSOQName =
+        final QName idpSSOQName =
                 new QName(SAMLConstants.SAML20MD_NS, IDPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        QName spSSOQName =
+        final QName spSSOQName =
                 new QName(SAMLConstants.SAML20MD_NS, SPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        QName authnAuthQName =
+        final QName authnAuthQName =
                 new QName(SAMLConstants.SAML20MD_NS, AuthnAuthorityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        QName pdpQName =
+        final QName pdpQName =
                 new QName(SAMLConstants.SAML20MD_NS, PDPDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         QName affilQName =
@@ -314,17 +316,17 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
         descriptor.getRoleDescriptors(PDPDescriptor.DEFAULT_ELEMENT_NAME).add((PDPDescriptor) buildXMLObject(pdpQName));
         descriptor.setAffiliationDescriptor((AffiliationDescriptor) buildXMLObject(affilQName));
 
-        QName orgQName =
+        final QName orgQName =
                 new QName(SAMLConstants.SAML20MD_NS, Organization.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.setOrganization((Organization) buildXMLObject(orgQName));
 
-        QName contactQName =
+        final QName contactQName =
                 new QName(SAMLConstants.SAML20MD_NS, ContactPerson.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getContactPersons().add((ContactPerson) buildXMLObject(contactQName));
 
-        QName addMDQName =
+        final QName addMDQName =
                 new QName(SAMLConstants.SAML20MD_NS, AdditionalMetadataLocation.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 3; i++) {
@@ -340,7 +342,7 @@ public class EntityDescriptorTest extends XMLObjectProviderBaseTestCase {
      * @return minimally populated Signature element
      */
     private Signature buildSignatureSkeleton() {
-        Signature signature = (Signature) buildXMLObject(Signature.DEFAULT_ELEMENT_NAME);
+        final Signature signature = (Signature) buildXMLObject(Signature.DEFAULT_ELEMENT_NAME);
         signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
         signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
         return signature;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
index 0bb359f86..6b2a3751f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsTest.java
@@ -31,6 +31,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.ExtensionsImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
 
     /**
@@ -53,8 +54,8 @@ public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        Extensions extensions = (Extensions) buildXMLObject(Extensions.DEFAULT_ELEMENT_NAME);
-        QName childQname = new QName("http://www.example.org/testObjects", "SimpleElement", "test");
+        final Extensions extensions = (Extensions) buildXMLObject(Extensions.DEFAULT_ELEMENT_NAME);
+        final QName childQname = new QName("http://www.example.org/testObjects", "SimpleElement", "test");
         
         extensions.getUnknownXMLObjects().add(buildXMLObject(childQname));
         extensions.getUnknownXMLObjects().add(buildXMLObject(childQname));
@@ -68,7 +69,7 @@ public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        Extensions extensions = (Extensions) unmarshallElement(singleElementFile);
+        final Extensions extensions = (Extensions) unmarshallElement(singleElementFile);
         
         Assert.assertNotNull(extensions);
     }
@@ -76,8 +77,8 @@ public class ExtensionsTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        Extensions extensions = (Extensions) unmarshallElement(childElementsFile);
-        
+        final Extensions extensions = (Extensions) unmarshallElement(childElementsFile);
+        assert extensions!=null;
         Assert.assertNotNull(extensions);
         Assert.assertEquals(extensions.getUnknownXMLObjects().size(), 3);
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
index b07d8d764..1418a3671 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.GivenName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.GivenName}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class GivenNameTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected name */
@@ -50,15 +51,15 @@ public class GivenNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        GivenName name = (GivenName) unmarshallElement(singleElementFile);
-        
+        final GivenName name = (GivenName) unmarshallElement(singleElementFile);
+        assert name!=null;
         Assert.assertEquals(name.getValue(), expectName, "Name was not expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        GivenName name = (new GivenNameBuilder()).buildObject();
+        final GivenName name = (new GivenNameBuilder()).buildObject();
         
         name.setValue(expectName);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
index 534c66abe..799e38549 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorTest.java
@@ -49,6 +49,7 @@ import org.testng.annotations.Test;
 /**
  * 
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** List of expected supported protocols */
@@ -98,15 +99,15 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
     }
 
     @Test public void testSingleElementUnmarshall() {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementFile);
-
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getSupportedProtocols(), expectedSupportedProtocol,
                 "Supported protocols not equal to expected value");
     }
 
     @Test public void testSingleElementOptionalAttributesUnmarshall() {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getCacheDuration(), expectedCacheDuration,
                 "Cache duration was not expected value");
         Assert.assertEquals(descriptor.getValidUntil(), expectedValidUntil, "ValidUntil was not expected value");
@@ -115,7 +116,7 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
     }
 
     @Test public void testSingleElementUnknownAttributesMarshall() {
-        IDPSSODescriptor descriptor = (new IDPSSODescriptorBuilder()).buildObject();
+        final IDPSSODescriptor descriptor = (new IDPSSODescriptorBuilder()).buildObject();
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             descriptor.getUnknownAttributes().put(unknownAttributeNames[i], unknownAttributeValues[i]);
@@ -125,9 +126,10 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementUnknownAttributesFile);
-        AttributeMap attributes = descriptor.getUnknownAttributes();
-
+        final  IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(singleElementUnknownAttributesFile);
+        assert descriptor!=null;
+        final AttributeMap attributes = descriptor.getUnknownAttributes();
+        assert descriptor!=null;
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             Assert.assertEquals(attributes.get(unknownAttributeNames[i]), unknownAttributeValues[i]);
@@ -136,8 +138,8 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(childElementsFile);
-
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) unmarshallElement(childElementsFile);
+        assert descriptor!=null;
         Assert.assertNotNull(descriptor.getExtensions(), "Extensions");
         Assert.assertNotNull(descriptor.getOrganization(), "Organization child");
         Assert.assertEquals(descriptor.getContactPersons().size(), 2, "ContactPerson count");
@@ -165,10 +167,10 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
     }
 
     @Test public void testSingleElementMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, IDPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
 
         for (String protocol : expectedSupportedProtocol) {
             descriptor.addSupportedProtocol(protocol);
@@ -179,10 +181,10 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
     }
 
     @Test public void testSingleElementOptionalAttributesMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, IDPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
 
         for (String protocol : expectedSupportedProtocol) {
             descriptor.addSupportedProtocol(protocol);
@@ -198,66 +200,66 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, IDPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(qname);
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
-        QName orgQName =
+        final QName orgQName =
                 new QName(SAMLConstants.SAML20MD_NS, Organization.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.setOrganization((Organization) buildXMLObject(orgQName));
 
-        QName contactQName =
+        final QName contactQName =
                 new QName(SAMLConstants.SAML20MD_NS, ContactPerson.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
             descriptor.getContactPersons().add((ContactPerson) buildXMLObject(contactQName));
         }
 
-        QName artResQName =
+        final QName artResQName =
                 new QName(SAMLConstants.SAML20MD_NS, ArtifactResolutionService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getArtifactResolutionServices().add((ArtifactResolutionService) buildXMLObject(artResQName));
 
-        QName sloQName =
+        final QName sloQName =
                 new QName(SAMLConstants.SAML20MD_NS, SingleLogoutService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
             descriptor.getSingleLogoutServices().add((SingleLogoutService) buildXMLObject(sloQName));
         }
 
-        QName mngNameIDQName =
+        final QName mngNameIDQName =
                 new QName(SAMLConstants.SAML20MD_NS, ManageNameIDService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 4; i++) {
             descriptor.getManageNameIDServices().add((ManageNameIDService) buildXMLObject(mngNameIDQName));
         }
 
-        QName nameIDFormatQName =
+        final QName nameIDFormatQName =
                 new QName(SAMLConstants.SAML20MD_NS, NameIDFormat.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getNameIDFormats().add((NameIDFormat) buildXMLObject(nameIDFormatQName));
 
-        QName ssoQName =
+        final QName ssoQName =
                 new QName(SAMLConstants.SAML20MD_NS, SingleSignOnService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 3; i++) {
             descriptor.getSingleSignOnServices().add((SingleSignOnService) buildXMLObject(ssoQName));
         }
 
-        QName nameIDMapQName =
+        final QName nameIDMapQName =
                 new QName(SAMLConstants.SAML20MD_NS, NameIDMappingService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
             descriptor.getNameIDMappingServices().add((NameIDMappingService) buildXMLObject(nameIDMapQName));
         }
 
-        QName assertIDReqQName =
+        final  QName assertIDReqQName =
                 new QName(SAMLConstants.SAML20MD_NS, AssertionIDRequestService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 3; i++) {
@@ -265,7 +267,7 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
                     .add((AssertionIDRequestService) buildXMLObject(assertIDReqQName));
         }
 
-        QName attributeProlfileQName =
+        final QName attributeProlfileQName =
                 new QName(SAMLConstants.SAML20MD_NS, AttributeProfile.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 3; i++) {
@@ -283,7 +285,7 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
      * Test the proper behavior of the XSBooleanValue attributes.
      */
     @Test public void testXSBooleanAttributes() {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) buildXMLObject(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
 
         descriptor.setWantAuthnRequestsSigned(Boolean.TRUE);
         Assert.assertEquals(descriptor.getWantAuthnRequestsSigned(), Boolean.TRUE,
@@ -291,7 +293,9 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.getWantAuthnRequestsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.getWantAuthnRequestsSignedXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.getWantAuthnRequestsSignedXSBoolean().toString(), "true",
+        XSBooleanValue bool = descriptor.getWantAuthnRequestsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true",
                 "XSBooleanValue string was unexpected value");
 
         descriptor.setWantAuthnRequestsSigned(Boolean.FALSE);
@@ -300,7 +304,9 @@ public class IDPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.getWantAuthnRequestsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.getWantAuthnRequestsSignedXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.getWantAuthnRequestsSignedXSBoolean().toString(), "false",
+        bool = descriptor.getWantAuthnRequestsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false",
                 "XSBooleanValue string was unexpected value");
 
         descriptor.setWantAuthnRequestsSigned((Boolean) null);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
index 4f60baf7d..46e1ef0c5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
@@ -33,6 +33,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.KeyDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Name attribute value. */
@@ -60,9 +61,9 @@ public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(singleElementFile);
+        final KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(singleElementFile);
         
-        Assert.assertNotNull(keyDescriptor, "KeyDescriptor");
+        assert keyDescriptor!=null;
         Assert.assertEquals(keyDescriptor.getUse(), UsageType.UNSPECIFIED, "Unexpected use attribute value");
 
     }
@@ -70,9 +71,9 @@ public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        final KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
         
-        Assert.assertNotNull(keyDescriptor, "KeyDescriptor");
+        assert keyDescriptor!=null;
         Assert.assertEquals(keyDescriptor.getUse(), expectedUse, "Use attribute");
     }
     
@@ -86,12 +87,15 @@ public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
         KeyDescriptor keyDescriptor = null;
         
         keyDescriptor = unmarshallElement("/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUseNotPresent.xml");
+        assert keyDescriptor!=null;
         Assert.assertEquals(keyDescriptor.getUse(), UsageType.UNSPECIFIED);
             
         keyDescriptor = unmarshallElement("/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUseSigning.xml");
+        assert keyDescriptor!=null;
         Assert.assertEquals(keyDescriptor.getUse(), UsageType.SIGNING);
         
         keyDescriptor = unmarshallElement("/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUseEncryption.xml");
+        assert keyDescriptor!=null;
         Assert.assertEquals(keyDescriptor.getUse(), UsageType.ENCRYPTION);
         
         try {
@@ -113,8 +117,8 @@ public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(childElementsFile);
-
+        final KeyDescriptor keyDescriptor = (KeyDescriptor) unmarshallElement(childElementsFile);
+        assert keyDescriptor!=null;
         Assert.assertNotNull(keyDescriptor, "KeyDescriptor");
         Assert.assertNotNull(keyDescriptor.getKeyInfo(), "KeyInfo Child element");
         Assert.assertEquals(keyDescriptor.getEncryptionMethods().size(), expectedNumEncMethods,
@@ -124,7 +128,7 @@ public class KeyDescriptorTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        KeyDescriptor keyDescriptor = (new KeyDescriptorBuilder()).buildObject();
+        final KeyDescriptor keyDescriptor = (new KeyDescriptorBuilder()).buildObject();
         keyDescriptor.setUse(null);
 
         assertXMLEquals(expectedDOM, keyDescriptor);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
index 1272afbc1..6c43b15d8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.ManageNameIDService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.ManageNameIDServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ManageNameIDServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -54,8 +55,8 @@ public class ManageNameIDServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        ManageNameIDService service = (ManageNameIDService) unmarshallElement(singleElementFile);
-        
+        final ManageNameIDService service = (ManageNameIDService) unmarshallElement(singleElementFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
@@ -63,8 +64,8 @@ public class ManageNameIDServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        ManageNameIDService service = (ManageNameIDService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final ManageNameIDService service = (ManageNameIDService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
@@ -73,7 +74,7 @@ public class ManageNameIDServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        ManageNameIDService service = (new ManageNameIDServiceBuilder()).buildObject();
+        final ManageNameIDService service = (new ManageNameIDServiceBuilder()).buildObject();
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -84,7 +85,7 @@ public class ManageNameIDServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        ManageNameIDService service = (ManageNameIDService) buildXMLObject(ManageNameIDService.DEFAULT_ELEMENT_NAME);
+        final ManageNameIDService service = (ManageNameIDService) buildXMLObject(ManageNameIDService.DEFAULT_ELEMENT_NAME);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
index 717c94f32..8b834046c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.NameIDFormat;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.NameIDFormat}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDFormatTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected format */
@@ -50,15 +51,15 @@ public class NameIDFormatTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        NameIDFormat format = (NameIDFormat) unmarshallElement(singleElementFile);
-        
+        final NameIDFormat format = (NameIDFormat) unmarshallElement(singleElementFile);
+        assert format!=null;
         Assert.assertEquals(format.getURI(), expectFormat, "Format was not expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        NameIDFormat format = (NameIDFormat) buildXMLObject(NameIDFormat.DEFAULT_ELEMENT_NAME);
+        final NameIDFormat format = (NameIDFormat) buildXMLObject(NameIDFormat.DEFAULT_ELEMENT_NAME);
         
         format.setURI(expectFormat);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
index b1672badf..9d3ef62ca 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.NameIDMappingService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.NameIDMappingServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class NameIDMappingServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -54,8 +55,8 @@ public class NameIDMappingServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        NameIDMappingService service = (NameIDMappingService) unmarshallElement(singleElementFile);
-        
+        final NameIDMappingService service = (NameIDMappingService) unmarshallElement(singleElementFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
@@ -63,8 +64,8 @@ public class NameIDMappingServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        NameIDMappingService service = (NameIDMappingService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final NameIDMappingService service = (NameIDMappingService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;        
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
@@ -73,7 +74,7 @@ public class NameIDMappingServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        NameIDMappingService service = (new NameIDMappingServiceBuilder()).buildObject();
+        final NameIDMappingService service = (new NameIDMappingServiceBuilder()).buildObject();
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -84,7 +85,7 @@ public class NameIDMappingServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        NameIDMappingService service = (NameIDMappingService) buildXMLObject(NameIDMappingService.DEFAULT_ELEMENT_NAME);
+        final NameIDMappingService service = (NameIDMappingService) buildXMLObject(NameIDMappingService.DEFAULT_ELEMENT_NAME);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
index 82ab08952..79db84c43 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.OrganizationName}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class OrganizationDisplayNameTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected name. */
@@ -53,8 +54,8 @@ public class OrganizationDisplayNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        OrganizationDisplayName name = (OrganizationDisplayName) unmarshallElement(singleElementFile);
-        
+        final OrganizationDisplayName name = (OrganizationDisplayName) unmarshallElement(singleElementFile);
+        assert name!=null;
         Assert.assertEquals(name.getValue(), expectValue, "Name was not expected value");
         Assert.assertEquals(name.getXMLLang(), expectLang, "Name was not expected value");
     }
@@ -62,7 +63,7 @@ public class OrganizationDisplayNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        OrganizationDisplayName name = (OrganizationDisplayName) buildXMLObject(OrganizationDisplayName.DEFAULT_ELEMENT_NAME);
+        final OrganizationDisplayName name = (OrganizationDisplayName) buildXMLObject(OrganizationDisplayName.DEFAULT_ELEMENT_NAME);
         
         name.setValue(expectValue);
         name.setXMLLang(expectLang);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
index 733328abe..f91a287d1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml2.metadata.OrganizationName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.OrganizationName}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class OrganizationNameTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected name. */
@@ -57,8 +58,8 @@ public class OrganizationNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        OrganizationName name = (OrganizationName) unmarshallElement(singleElementFile);
-        
+        final OrganizationName name = (OrganizationName) unmarshallElement(singleElementFile);
+        assert name!=null;
         Assert.assertEquals(name.getValue(), expectValue, "Name was not expected value");
         Assert.assertEquals(name.getXMLLang(), expectLang, "xml:lang was not expected value");
         name.hashCode();
@@ -67,9 +68,9 @@ public class OrganizationNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, OrganizationName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-        OrganizationName name = (OrganizationName) buildXMLObject(qname);
-        
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, OrganizationName.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final OrganizationName name = (OrganizationName) buildXMLObject(qname);
+        assert name!=null;        
         name.setValue(expectValue);
         name.setXMLLang(expectLang);
         assertXMLEquals(expectedDOM, name);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
index 32e2d56d1..f39ac2532 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationTest.java
@@ -37,6 +37,7 @@ import org.testng.annotations.Test;
 /**
  * Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.metadata.OrganizationName}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class OrganizationTest extends XMLObjectProviderBaseTestCase {
 
     /** Unknown Attributes */
@@ -57,14 +58,16 @@ public class OrganizationTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnmarshall() {
-        Organization org = (Organization) unmarshallElement(singleElementFile);
+        final Organization org = (Organization) unmarshallElement(singleElementFile);
+        assert org!=null;
         Assert.assertEquals(org.getDisplayNames().size(), 0, "Display names");
     }
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        Organization org = (Organization) unmarshallElement(singleElementUnknownAttributesFile);
-        AttributeMap attributes = org.getUnknownAttributes();
+        final Organization org = (Organization) unmarshallElement(singleElementUnknownAttributesFile);
+        assert org!=null;
+        final AttributeMap attributes = org.getUnknownAttributes();
 
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
         for (int i = 0; i < unknownAttributeNames.length; i++) {
@@ -74,8 +77,8 @@ public class OrganizationTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        Organization org = (Organization) unmarshallElement(childElementsFile);
-
+        final Organization org = (Organization) unmarshallElement(childElementsFile);
+        assert org!=null;
         Assert.assertNotNull(org.getExtensions(), "Extensions");
         Assert.assertEquals(org.getOrganizationNames().size(), 3, "OrganizationName count");
         Assert.assertEquals(org.getDisplayNames().size(), 2, "DisplayNames count");
@@ -84,13 +87,13 @@ public class OrganizationTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementMarshall() {
-        Organization org = (Organization) buildXMLObject(Organization.DEFAULT_ELEMENT_NAME);
+        final Organization org = (Organization) buildXMLObject(Organization.DEFAULT_ELEMENT_NAME);
 
         assertXMLEquals(expectedDOM, org);
     }
 
     @Test public void testSingleElementUnknownAttributesMarshall() {
-        Organization org = (new OrganizationBuilder()).buildObject();
+        final Organization org = (new OrganizationBuilder()).buildObject();
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             org.getUnknownAttributes().put(unknownAttributeNames[i], unknownAttributeValues[i]);
@@ -102,9 +105,9 @@ public class OrganizationTest extends XMLObjectProviderBaseTestCase {
      * {@inheritDoc}
      */
     @Test public void testChildElementsMarshall() {
-        Organization org = (Organization) buildXMLObject(Organization.DEFAULT_ELEMENT_NAME);
+        final Organization org = (Organization) buildXMLObject(Organization.DEFAULT_ELEMENT_NAME);
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         org.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
index 73adc30cb..2b8c15af0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
@@ -32,6 +32,7 @@ import org.opensaml.saml.saml2.metadata.OrganizationURL;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.OrganizationURL}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class OrganizationURLTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected URL. */
@@ -50,8 +51,8 @@ public class OrganizationURLTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        OrganizationURL url = (OrganizationURL) unmarshallElement(singleElementFile);
-        
+        final OrganizationURL url = (OrganizationURL) unmarshallElement(singleElementFile);
+        assert url!=null;
         Assert.assertEquals(url.getURI(), expectValue, "URL was not expected value");
         Assert.assertEquals(url.getXMLLang(), expectLang, "langg was not expected value");
         url.hashCode();
@@ -60,8 +61,8 @@ public class OrganizationURLTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, OrganizationURL.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-        OrganizationURL url = (OrganizationURL) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, OrganizationURL.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final OrganizationURL url = (OrganizationURL) buildXMLObject(qname);
         
         url.setURI(expectValue);
         url.setXMLLang(expectLang);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
index b69bf28da..2c680a42b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
@@ -42,6 +42,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.PDPDescriptorImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** List of expected supported protocols */
@@ -79,16 +80,16 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnmarshall() {
-        PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(singleElementFile);
-
+        final PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(singleElementFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getSupportedProtocols(), expectedSupportedProtocol,
                 "Supported protocols not equal to expected value");
     }
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesUnmarshall() {
-        PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
+        final PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getCacheDuration(), expectedCacheDuration,
                 "Cache duration was not expected value");
         Assert.assertEquals(descriptor.getValidUntil(), expectedValidUntil, "ValidUntil was not expected value");
@@ -97,8 +98,8 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(childElementsFile);
-
+        final PDPDescriptor descriptor = (PDPDescriptor) unmarshallElement(childElementsFile);
+        assert descriptor!=null;
         Assert.assertNotNull(descriptor.getExtensions(), "<Extensions>");
         Assert.assertEquals(descriptor.getKeyDescriptors().size(), 0, "KeyDescriptor");
 
@@ -117,7 +118,7 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementMarshall() {
-        PDPDescriptor descriptor = (new PDPDescriptorBuilder()).buildObject();
+        final PDPDescriptor descriptor = (new PDPDescriptorBuilder()).buildObject();
 
         for (String protocol : expectedSupportedProtocol) {
             descriptor.addSupportedProtocol(protocol);
@@ -128,10 +129,10 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, PDPDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        PDPDescriptor descriptor = (PDPDescriptor) buildXMLObject(qname);
+        final PDPDescriptor descriptor = (PDPDescriptor) buildXMLObject(qname);
 
         for (String protocol : expectedSupportedProtocol) {
             descriptor.addSupportedProtocol(protocol);
@@ -146,23 +147,23 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsMarshall() {
-        QName qname =
+        final QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, PDPDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        PDPDescriptor descriptor = (PDPDescriptor) buildXMLObject(qname);
+        final PDPDescriptor descriptor = (PDPDescriptor) buildXMLObject(qname);
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
-        QName authzQName =
+        final QName authzQName =
                 new QName(SAMLConstants.SAML20MD_NS, AuthzService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 3; i++) {
             descriptor.getAuthzServices().add((AuthzService) buildXMLObject(authzQName));
         }
 
-        QName assertIDReqQName =
+        final QName assertIDReqQName =
                 new QName(SAMLConstants.SAML20MD_NS, AssertionIDRequestService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
@@ -170,7 +171,7 @@ public class PDPDescriptorTest extends XMLObjectProviderBaseTestCase {
                     .add((AssertionIDRequestService) buildXMLObject(assertIDReqQName));
         }
 
-        QName nameIDFormatQName =
+        final QName nameIDFormatQName =
                 new QName(SAMLConstants.SAML20MD_NS, NameIDFormat.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getNameIDFormats().add((NameIDFormat) buildXMLObject(nameIDFormatQName));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
index d205a9bde..3501c576a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
@@ -35,6 +35,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.RequestedAttributeImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
 
     /** Expected Name attribute value */
@@ -74,9 +75,9 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        RequestedAttribute attribute = (RequestedAttribute) unmarshallElement(singleElementFile);
-
-        String name = attribute.getName();
+        final RequestedAttribute attribute = (RequestedAttribute) unmarshallElement(singleElementFile);
+        assert attribute!=null;
+        final String name = attribute.getName();
         Assert.assertEquals(name, expectedName, "Name was " + name + ", expected " + expectedName);
 
     }
@@ -84,20 +85,22 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        RequestedAttribute requestedAttribute = (RequestedAttribute) unmarshallElement(singleElementOptionalAttributesFile);
+        final RequestedAttribute requestedAttribute = (RequestedAttribute) unmarshallElement(singleElementOptionalAttributesFile);
+        assert requestedAttribute!=null;
 
-        String name = requestedAttribute.getName();
+        final String name = requestedAttribute.getName();
         Assert.assertEquals(name, expectedName, "Name was " + name + ", expected " + expectedName);
 
-        String nameFormat = requestedAttribute.getNameFormat();
+        final String nameFormat = requestedAttribute.getNameFormat();
         Assert.assertEquals(nameFormat, expectedNameFormat,
                 "NameFormat was " + nameFormat + ", expected " + expectedNameFormat);
 
-        String friendlyName = requestedAttribute.getFriendlyName();
+        final String friendlyName = requestedAttribute.getFriendlyName();
         Assert.assertEquals(friendlyName, expectedFriendlyName,
                 "FriendlyName was " + friendlyName + ", expected " + expectedFriendlyName);
-
-        boolean isRequired = requestedAttribute.isRequired().booleanValue();
+        final Boolean bool = requestedAttribute.isRequired();
+        assert bool != null;
+        boolean isRequired = bool.booleanValue();
         Assert.assertEquals(requestedAttribute.isRequiredXSBoolean(), expectedIsRequired,
                 "Is Required was " + isRequired + ", expected " + expectedIsRequired);
     }
@@ -105,19 +108,20 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsUnmarshall() {
-        RequestedAttribute attribute = (RequestedAttribute) unmarshallElement(childElementsFile);
+        final RequestedAttribute attribute = (RequestedAttribute) unmarshallElement(childElementsFile);
+        assert attribute!=null;
 
-        String name = attribute.getName();
+        final String name = attribute.getName();
         Assert.assertEquals(name, expectedName, "Name was " + name + ", expected " + expectedName);
         
         Assert.assertEquals(attribute.getAttributeValues().size(), 2);
         
         Assert.assertTrue(attribute.getAttributeValues().get(0) instanceof XSAny);
-        XSAny value0 = (XSAny) attribute.getAttributeValues().get(0);
+        final XSAny value0 = (XSAny) attribute.getAttributeValues().get(0);
         Assert.assertEquals(value0.getTextContent(), expectedAttributeValue0);
         
         Assert.assertTrue(attribute.getAttributeValues().get(1) instanceof XSAny);
-        XSAny value1 = (XSAny) attribute.getAttributeValues().get(1);
+        final XSAny value1 = (XSAny) attribute.getAttributeValues().get(1);
         Assert.assertEquals(value1.getTextContent(), expectedAttributeValue1);
     }
 
@@ -125,8 +129,8 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, RequestedAttribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-        RequestedAttribute requestedAttribute = (RequestedAttribute) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, RequestedAttribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final RequestedAttribute requestedAttribute = (RequestedAttribute) buildXMLObject(qname);
 
         requestedAttribute.setName(expectedName);
 
@@ -136,7 +140,7 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        RequestedAttribute requestedAttribute = (new RequestedAttributeBuilder()).buildObject();
+        final RequestedAttribute requestedAttribute = (new RequestedAttributeBuilder()).buildObject();
 
         requestedAttribute.setName(expectedName);
         requestedAttribute.setNameFormat(expectedNameFormat);
@@ -149,18 +153,18 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testChildElementsMarshall() {
-        QName qname = new QName(SAMLConstants.SAML20MD_NS, RequestedAttribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-        RequestedAttribute requestedAttribute = (RequestedAttribute) buildXMLObject(qname);
+        final QName qname = new QName(SAMLConstants.SAML20MD_NS, RequestedAttribute.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
+        final RequestedAttribute requestedAttribute = (RequestedAttribute) buildXMLObject(qname);
 
         requestedAttribute.setName(expectedName);
         
-        XSAnyBuilder valueBuilder = (XSAnyBuilder) XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(XSAny.TYPE_NAME);
-
-        XSAny val0 = valueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
+        final XSAnyBuilder valueBuilder = (XSAnyBuilder) XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(XSAny.TYPE_NAME);
+        assert valueBuilder!=null;
+        final XSAny val0 = valueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
         val0.setTextContent(expectedAttributeValue0);
         requestedAttribute.getAttributeValues().add(val0);
         
-        XSAny val1 = valueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
+        final XSAny val1 = valueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
         val1.setTextContent(expectedAttributeValue1);
         requestedAttribute.getAttributeValues().add(val1);
 
@@ -172,7 +176,7 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
      */
     @Test
     public void testXSBooleanAttributes() {
-        RequestedAttribute attrib = 
+        final RequestedAttribute attrib = 
             (RequestedAttribute) buildXMLObject(RequestedAttribute.DEFAULT_ELEMENT_NAME);
         
         // isRequired attribute
@@ -181,14 +185,18 @@ public class RequestedAttributeTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(attrib.isRequiredXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(attrib.isRequiredXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(attrib.isRequiredXSBoolean().toString(), "true", "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool = attrib.isRequiredXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
         
         attrib.setIsRequired(Boolean.FALSE);
         Assert.assertEquals(attrib.isRequired(), Boolean.FALSE, "Unexpected value for boolean attribute found");
         Assert.assertNotNull(attrib.isRequiredXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(attrib.isRequiredXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(attrib.isRequiredXSBoolean().toString(), "false", "XSBooleanValue string was unexpected value");
+        bool = attrib.isRequiredXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
         
         attrib.setIsRequired((Boolean) null);
         Assert.assertEquals(attrib.isRequired(), Boolean.FALSE, "Unexpected default value for boolean attribute found");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
index bd1673021..87cab7ed3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
@@ -45,6 +45,7 @@ import org.testng.annotations.Test;
 /**
  * 
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** expected value for AuthnRequestSigned attribute */
@@ -90,8 +91,8 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementUnmarshall() {
-        SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(singleElementFile);
-
+        final SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(singleElementFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getSupportedProtocols(), expectedSupportedProtocol,
                 "Supported protocols not equal to expected value");
         descriptor.removeAllSupportedProtocols();
@@ -101,8 +102,8 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testSingleElementOptionalAttributesUnmarshall() {
-        SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(singleElementOptionalAttributesFile);
-
+        final SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(singleElementOptionalAttributesFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getSupportedProtocols(), expectedSupportedProtocol,
                 "Supported protocols not equal to expected value");
         Assert.assertEquals(descriptor.isAuthnRequestsSignedXSBoolean(), expectedAuthnRequestSigned,
@@ -123,8 +124,8 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(childElementsFile);
-
+        final SPSSODescriptor descriptor = (SPSSODescriptor) unmarshallElement(childElementsFile);
+        assert descriptor!=null;
         Assert.assertEquals(descriptor.getID(), expectedId);
         Assert.assertEquals(descriptor.getSignatureReferenceID(), expectedId);
         Assert.assertNotNull(descriptor.getSignature());
@@ -170,7 +171,7 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
     }
 
     @Test public void testSingleElementOptionalAttributesMarshall() {
-        SPSSODescriptor descriptor = (new SPSSODescriptorBuilder()).buildObject();
+        final SPSSODescriptor descriptor = (new SPSSODescriptorBuilder()).buildObject();
 
         descriptor.setAuthnRequestsSigned(expectedAuthnRequestSigned);
         descriptor.setWantAssertionsSigned(expectedWantAssertionsSigned);
@@ -187,55 +188,55 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
 
     /** {@inheritDoc} */
     @Test public void testChildElementsMarshall() {
-        QName qname =
+        final  QName qname =
                 new QName(SAMLConstants.SAML20MD_NS, SPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
-        SPSSODescriptor descriptor = (SPSSODescriptor) buildXMLObject(qname);
+        final SPSSODescriptor descriptor = (SPSSODescriptor) buildXMLObject(qname);
 
         descriptor.setID(expectedId);
         descriptor.setSignature( buildSignatureSkeleton() );
 
-        QName extensionsQName =
+        final QName extensionsQName =
                 new QName(SAMLConstants.SAML20MD_NS, Extensions.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
         descriptor.setExtensions((Extensions) buildXMLObject(extensionsQName));
 
-        QName orgQName =
+        final QName orgQName =
                 new QName(SAMLConstants.SAML20MD_NS, Organization.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.setOrganization((Organization) buildXMLObject(orgQName));
 
-        QName contactQName =
+        final QName contactQName =
                 new QName(SAMLConstants.SAML20MD_NS, ContactPerson.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
             descriptor.getContactPersons().add((ContactPerson) buildXMLObject(contactQName));
         }
 
-        QName artResQName =
+        final  QName artResQName =
                 new QName(SAMLConstants.SAML20MD_NS, ArtifactResolutionService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getArtifactResolutionServices().add((ArtifactResolutionService) buildXMLObject(artResQName));
 
-        QName sloQName =
+        final QName sloQName =
                 new QName(SAMLConstants.SAML20MD_NS, SingleLogoutService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
             descriptor.getSingleLogoutServices().add((SingleLogoutService) buildXMLObject(sloQName));
         }
 
-        QName mngNameIDQName =
+        final QName mngNameIDQName =
                 new QName(SAMLConstants.SAML20MD_NS, ManageNameIDService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 4; i++) {
             descriptor.getManageNameIDServices().add((ManageNameIDService) buildXMLObject(mngNameIDQName));
         }
 
-        QName nameIDFormatQName =
+        final QName nameIDFormatQName =
                 new QName(SAMLConstants.SAML20MD_NS, NameIDFormat.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getNameIDFormats().add((NameIDFormat) buildXMLObject(nameIDFormatQName));
 
-        QName assertConsumeQName =
+        final QName assertConsumeQName =
                 new QName(SAMLConstants.SAML20MD_NS, AssertionConsumerService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         for (int i = 0; i < 2; i++) {
@@ -243,7 +244,7 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
                     .add((AssertionConsumerService) buildXMLObject(assertConsumeQName));
         }
 
-        QName attribConsumeQName =
+        final QName attribConsumeQName =
                 new QName(SAMLConstants.SAML20MD_NS, AttributeConsumingService.DEFAULT_ELEMENT_LOCAL_NAME,
                         SAMLConstants.SAML20MD_PREFIX);
         descriptor.getAttributeConsumingServices().add((AttributeConsumingService) buildXMLObject(attribConsumeQName));
@@ -255,7 +256,7 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
      * Test the proper behavior of the XSBooleanValue attributes.
      */
     @Test public void testXSBooleanAttributes() {
-        SPSSODescriptor descriptor = (SPSSODescriptor) buildXMLObject(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
+        final SPSSODescriptor descriptor = (SPSSODescriptor) buildXMLObject(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
 
         // AuthnRequestsSigned
         descriptor.setAuthnRequestsSigned(Boolean.TRUE);
@@ -264,8 +265,9 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.isAuthnRequestsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.isAuthnRequestsSignedXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.isAuthnRequestsSignedXSBoolean().toString(), "true",
-                "XSBooleanValue string was unexpected value");
+        XSBooleanValue bool = descriptor.isAuthnRequestsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
 
         descriptor.setAuthnRequestsSigned(Boolean.FALSE);
         Assert.assertEquals(descriptor.isAuthnRequestsSigned(), Boolean.FALSE,
@@ -273,7 +275,9 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.isAuthnRequestsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.isAuthnRequestsSignedXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.isAuthnRequestsSignedXSBoolean().toString(), "false",
+        bool = descriptor.isAuthnRequestsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false",
                 "XSBooleanValue string was unexpected value");
 
         descriptor.setAuthnRequestsSigned((Boolean) null);
@@ -288,8 +292,9 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.getWantAssertionsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.getWantAssertionsSignedXSBoolean(), new XSBooleanValue(Boolean.TRUE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.getWantAssertionsSignedXSBoolean().toString(), "true",
-                "XSBooleanValue string was unexpected value");
+        bool = descriptor.getWantAssertionsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "true", "XSBooleanValue string was unexpected value");
 
         descriptor.setWantAssertionsSigned(Boolean.FALSE);
         Assert.assertEquals(descriptor.getWantAssertionsSigned(), Boolean.FALSE,
@@ -297,8 +302,9 @@ public class SPSSODescriptorTest extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(descriptor.getWantAssertionsSignedXSBoolean(), "XSBooleanValue was null");
         Assert.assertEquals(descriptor.getWantAssertionsSignedXSBoolean(), new XSBooleanValue(Boolean.FALSE, false),
                 "XSBooleanValue was unexpected value");
-        Assert.assertEquals(descriptor.getWantAssertionsSignedXSBoolean().toString(), "false",
-                "XSBooleanValue string was unexpected value");
+        bool = descriptor.getWantAssertionsSignedXSBoolean();
+        assert bool != null;
+        Assert.assertEquals(bool.toString(), "false", "XSBooleanValue string was unexpected value");
 
         descriptor.setWantAssertionsSigned((Boolean) null);
         Assert.assertEquals(descriptor.getWantAssertionsSigned(), Boolean.FALSE,
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
index 281316e03..b46d23cfc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.metadata.ServiceDescription;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.ServiceDescription}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ServiceDescriptionTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected description */
@@ -47,7 +48,8 @@ public class ServiceDescriptionTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        ServiceDescription description = (ServiceDescription) unmarshallElement(singleElementFile);
+        final ServiceDescription description = (ServiceDescription) unmarshallElement(singleElementFile);
+        assert description!=null;
         
         Assert.assertEquals(description.getValue(), expectLocalizedDescription, "Description was not expected value");
         Assert.assertEquals(description.getXMLLang(), expectLang, "xml:lamg was not expected value");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
index ba1795ca1..e04448b08 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameTest.java
@@ -32,6 +32,7 @@ import org.opensaml.saml.saml2.metadata.ServiceName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.ServiceDescription}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class ServiceNameTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected description. */
@@ -51,7 +52,8 @@ public class ServiceNameTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall() {
         ServiceName name = (ServiceName) unmarshallElement(singleElementFile);
-        
+        assert name!=null;
+
         Assert.assertEquals(name.getXMLLang(), expectLang, "xml:lamg was not expected value");
         Assert.assertEquals(name.getValue(), expectValue, "Name was not expected value");
     }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
index c59beadcc..e33a27b4a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
@@ -35,6 +35,7 @@ import org.testng.annotations.Test;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.SingleLogoutServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -66,17 +67,17 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementFile);
-        
+        final SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
     }
     
     /** {@inheritDoc} */
     @Test public void testSingleElementUnknownAttributesUnmarshall() {
-        SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementUnknownAttributesFile);
-        AttributeMap attributes = service.getUnknownAttributes();
-
+        final SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementUnknownAttributesFile);
+        assert service!=null;
+        final AttributeMap attributes = service.getUnknownAttributes();
         Assert.assertEquals(attributes.entrySet().size(), unknownAttributeNames.length);
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             Assert.assertEquals(attributes.get(unknownAttributeNames[i]), unknownAttributeValues[i]);
@@ -87,8 +88,8 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
-        SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        final SingleLogoutService service = (SingleLogoutService) unmarshallElement(singleElementOptionalAttributesFile);
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
@@ -97,7 +98,7 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        SingleLogoutService service = (SingleLogoutService) buildXMLObject(SingleLogoutService.DEFAULT_ELEMENT_NAME);
+        final SingleLogoutService service = (SingleLogoutService) buildXMLObject(SingleLogoutService.DEFAULT_ELEMENT_NAME);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -107,7 +108,7 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     
     @Test
     public void testSingleElementUnknownAttributesMarshall() {
-        SingleLogoutService service = (new SingleLogoutServiceBuilder()).buildObject();
+        final SingleLogoutService service = (new SingleLogoutServiceBuilder()).buildObject();
 
         for (int i = 0; i < unknownAttributeNames.length; i++) {
             service.getUnknownAttributes().put(unknownAttributeNames[i], unknownAttributeValues[i]);
@@ -119,7 +120,7 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementOptionalAttributesMarshall() {
-        SingleLogoutService service = (SingleLogoutService) buildXMLObject(SingleLogoutService.DEFAULT_ELEMENT_NAME);
+        final SingleLogoutService service = (SingleLogoutService) buildXMLObject(SingleLogoutService.DEFAULT_ELEMENT_NAME);
         
         service.setBinding(expectedBinding);
         service.setLocation(expectedLocation);
@@ -130,7 +131,8 @@ public class SingleLogoutServiceTest extends XMLObjectProviderBaseTestCase {
     
     /** {@inheritDoc} */
     @Test public void testChildElementsUnmarshall() {
-        SingleLogoutService service = (SingleLogoutService) unmarshallElement(childElementsFile);
+        final SingleLogoutService service = (SingleLogoutService) unmarshallElement(childElementsFile);
+        assert service!=null;
         Assert.assertEquals(service.getUnknownXMLObjects().size(), 1);
     }
     
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
index 54e030235..f3c62103c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.SingleSignOnService;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.impl.SingleLogoutServiceImpl}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SingleSignOnServiceTest extends XMLObjectProviderBaseTestCase {
     
     protected String expectedBinding;
@@ -55,6 +56,7 @@ public class SingleSignOnServiceTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementUnmarshall() {
         SingleSignOnService service = ( SingleSignOnService) unmarshallElement(singleElementFile);
+        assert service!=null;
         
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
@@ -64,7 +66,7 @@ public class SingleSignOnServiceTest extends XMLObjectProviderBaseTestCase {
     @Test
     public void testSingleElementOptionalAttributesUnmarshall() {
         SingleSignOnService service = ( SingleSignOnService) unmarshallElement(singleElementOptionalAttributesFile);
-        
+        assert service!=null;
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
         Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
index a39120617..70474f5b6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.SurName;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.SurName}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class SurNameTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected description */
@@ -50,15 +51,15 @@ public class SurNameTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        SurName name = (SurName) unmarshallElement(singleElementFile);
-        
+        final SurName name = (SurName) unmarshallElement(singleElementFile);
+        assert name!=null;
         Assert.assertEquals(name.getValue(), expectedName, "Name was not expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        SurName name = (new SurNameBuilder()).buildObject();
+        final SurName name = (new SurNameBuilder()).buildObject();
         
         name.setValue(expectedName);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
index 156a352fb..df66157f2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml2.metadata.TelephoneNumber;
  * Test case for creating, marshalling, and unmarshalling
  * {@link org.opensaml.saml.saml2.metadata.TelephoneNumber}.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class TelephoneNumberTest extends XMLObjectProviderBaseTestCase {
     
     /** Expected telephone number */
@@ -50,15 +51,15 @@ public class TelephoneNumberTest extends XMLObjectProviderBaseTestCase {
     /** {@inheritDoc} */
     @Test
     public void testSingleElementUnmarshall() {
-        TelephoneNumber number = (TelephoneNumber) unmarshallElement(singleElementFile);
-        
+        final TelephoneNumber number = (TelephoneNumber) unmarshallElement(singleElementFile);
+        assert number!=null;
         Assert.assertEquals(number.getValue(), expectedNumber, "Telephone number was not expected value");
     }
 
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        TelephoneNumber number = (new TelephoneNumberBuilder()).buildObject();
+        final TelephoneNumber number = (new TelephoneNumberBuilder()).buildObject();
         
         number.setValue(expectedNumber);
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
index 4e854ae91..b569bd928 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/tests/MetadataTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.shared.xml.XMLParserException;
  * Test cases that parses real, "in-the-wild", metadata files. Currently uses the InCommon and SWITCH federation
  * metadata files (current as of the time this test was written).
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class MetadataTest extends XMLObjectBaseTestCase {
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
index 7e5894624..8ae243383 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AbstractSAML2NameIDGeneratorTest.java
@@ -31,7 +31,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /** Test for {@link AbstractSAML2NameIDGenerator}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AbstractSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase {
 
     @Nonnull private static final String NAME_QUALIFIER = "https://idp.example.org";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
index 235ff98ac..a23dc2062 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java
@@ -38,6 +38,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link AddChannelBindingsToAssertions} unit test. */
+ at SuppressWarnings({"null", "javadoc"})
 public class AddChannelBindingsToAssertionsTest  extends OpenSAMLInitBaseTestCase {
 
     private ChannelBindingsContext cbc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
index d7e17a4a5..00b8a8386 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertionsTest.java
@@ -38,6 +38,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link AddGeneratedKeyToAssertions} unit test. */
+ at SuppressWarnings({"null", "javadoc"})
 public class AddGeneratedKeyToAssertionsTest  extends OpenSAMLInitBaseTestCase {
 
     private ECPContext ecp;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
index f61aeba0f..5c41adaed 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
@@ -58,7 +58,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** Test for {@link AddNameIDToSubjects}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AddNameIDToSubjectsTest extends XMLObjectBaseTestCase {
 
     private static final String NAME_QUALIFIER = "https://idp.example.org";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
index 9cf2069bf..e2d0896a2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertionsTest.java
@@ -36,6 +36,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link AddOneTimeUseConditionToAssertions} unit test. */
+ at SuppressWarnings({"null", "javadoc"})
 public class AddOneTimeUseConditionToAssertionsTest  extends OpenSAMLInitBaseTestCase {
 
     private AddOneTimeUseConditionToAssertions action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
index dc0be09fc..7cd4da8b9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponseTest.java
@@ -34,7 +34,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** {@link AddStatusToResponse} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AddStatusToResponseTest extends OpenSAMLInitBaseTestCase {
     
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index ff871a606..53d096151 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -41,7 +41,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
 
 
 /** Test for {@link AddSubjectConfirmationToSubjects}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class AddSubjectConfirmationToSubjectsTest extends OpenSAMLInitBaseTestCase {
     
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
index 747a8c8ad..407d1608e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequestTest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Test for {@link CopyNameIDFromRequest}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class CopyNameIDFromRequestTest extends OpenSAMLInitBaseTestCase {
 
     private static final String NAME_QUALIFIER = "https://idp.example.org";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
index 154bc13e7..7b0735dac 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
@@ -52,6 +52,7 @@ import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
 import org.opensaml.xmlsec.keyinfo.impl.StaticKeyInfoCredentialResolver;
 
 /** Unit test for {@link DecryptNameIDs}. */
+ at SuppressWarnings({"null", "javadoc"})
 public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
     
     private KeyInfoCredentialResolver keyResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
index 43215622c..d5329e830 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertionsTest.java
@@ -47,7 +47,7 @@ import com.google.common.base.Strings;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Unit test for {@link EncryptAssertions}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptAssertionsTest extends OpenSAMLInitBaseTestCase {
     
     private EncryptionParameters encParams;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
index 0b1726e9c..03ecc70ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributesTest.java
@@ -52,7 +52,7 @@ import com.google.common.base.Strings;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Unit test for {@link EncryptAttributes}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptAttributesTest extends OpenSAMLInitBaseTestCase {
     
     private SAMLObjectBuilder<Attribute> builder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
index 4d78fad34..e7a60212d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDsTest.java
@@ -49,7 +49,7 @@ import com.google.common.base.Strings;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /** Unit test for {@link EncryptNameIDs}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class EncryptNameIDsTest extends OpenSAMLInitBaseTestCase {
     
     private EncryptionParameters encParams;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/MockAssertionValidationContextBuilder.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/MockAssertionValidationContextBuilder.java
index c3390d407..56a536824 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/MockAssertionValidationContextBuilder.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/MockAssertionValidationContextBuilder.java
@@ -29,6 +29,7 @@ import net.shibboleth.shared.logic.Constraint;
 /**
  *
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class MockAssertionValidationContextBuilder implements Function<AssertionValidationInput, ValidationContext> {
     
     private Map<String,Object> staticParams;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
index 78ef9b029..7a0f170d8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContextTest.java
@@ -38,7 +38,7 @@ import org.opensaml.saml.saml2.testing.SAML2ActionTestingSupport;
 import org.opensaml.xmlsec.EncryptionParameters;
 
 /** Unit test for {@link PopulateECPContext}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class PopulateECPContextTest extends OpenSAMLInitBaseTestCase {
     
     private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
index 73bcaea92..6715a4454 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifactTest.java
@@ -39,7 +39,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /** {@link ResolveArtifact} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class ResolveArtifactTest extends OpenSAMLInitBaseTestCase {
 
     private BasicSAMLArtifactMap artifactMap;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
index 659bb9686..bfe4448e4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
@@ -52,7 +52,7 @@ import org.testng.annotations.Test;
 import com.google.common.base.Strings;
 
 /** Unit test for self-encryption support in {@link AbstractEncryptAction} (using {@link EncryptNameIDs} as the concrete impl.) */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class TestSelfEncryption extends OpenSAMLInitBaseTestCase {
     
     private EncryptionParameters encParams, encParamsSelf1, encParamsSelf2;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index 09218a25b..cd38a8ba0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.testing.ConstantSupplier;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
     
     private ValidateAssertions action;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
index 8c6f8943e..7f7e1fb50 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilderTest.java
@@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.resolver.CriteriaSet;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class DefaultSAML20AssertionValidationContextBuilderTest extends XMLObjectBaseTestCase {
     
     private DefaultSAML20AssertionValidationContextBuilder builder;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
index 0aac53519..7a4452b5e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
@@ -66,7 +66,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
 /**
  * Unit test for {@link WSSecuritySAML20AssertionTokenSecurityHandler}.
  */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObjectBaseTestCase {
     private WSSecuritySAML20AssertionTokenSecurityHandler handler;
     
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
index 2a684d690..94eda99b8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
@@ -48,7 +48,7 @@ import org.testng.annotations.Test;
 import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.collection.Pair;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class InlineSelfEncryptionParametersStrategyTest extends OpenSAMLInitBaseTestCase {
     
     private Credential cred1, cred2;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
index 1ca6ff9a0..f27ba5a0a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
@@ -64,6 +64,7 @@ import org.w3c.dom.Document;
 /**
  * Testing the metadata credential resolver.
  */
+ at SuppressWarnings({"null", "javadoc"})
 public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     
     private String idpRSAPubKeyName = "IDP-SSO-RSA-Key";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
index 119cd0855..1597437c9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolverTest.java
@@ -91,7 +91,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class SAMLMetadataEncryptionParametersResolverTest extends XMLObjectBaseTestCase {
     
     private MetadataCredentialResolver mdCredResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
index 3c521b327..1462252f8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolverTest.java
@@ -55,7 +55,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
 public class SAMLMetadataSignatureSigningParametersResolverTest extends XMLObjectBaseTestCase {
     
     private SAMLMetadataSignatureSigningParametersResolver resolver;

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


More information about the commits mailing list