[java-opensaml] branch main updated: IDP-2069 - Null Handling Task

Rod Widdowson rdw at steadingsoftware.com
Wed Mar 15 14:48:48 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=52f8e303c8f490da9a6fe4ae0286e1853e0c7ed2

The following commit(s) were added to refs/heads/main by this push:
     new 52f8e303c IDP-2069 - Null Handling Task
52f8e303c is described below

commit 52f8e303c8f490da9a6fe4ae0286e1853e0c7ed2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 15 14:48:36 2023 +0000

    IDP-2069 - Null Handling Task
    
    https://shibboleth.atlassian.net/browse/IDP-2069
    
    Start to annotate up all the static final String &stativ final QName
---
 .../src/main/java/org/opensaml/core/xml/BaseBearing.java  |  5 +++--
 .../src/main/java/org/opensaml/core/xml/IdBearing.java    |  5 +++--
 .../src/main/java/org/opensaml/core/xml/LangBearing.java  |  5 +++--
 .../src/main/java/org/opensaml/core/xml/SpaceBearing.java |  5 +++--
 .../org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java |  4 ++--
 .../java/org/opensaml/saml/ext/saml2mdui/DisplayName.java |  2 +-
 .../main/java/org/opensaml/saml/saml1/core/Action.java    |  4 ++--
 .../org/opensaml/saml/saml2/metadata/Organization.java    |  9 +++++----
 .../resolver/index/impl/RoleMetadataIndexTest.java        |  3 ++-
 .../assertion/tests/BaseAssertionValidationTest.java      | 15 ++++++++-------
 .../assertion/tests/SAML20AssertionValidatorTest.java     |  4 ++--
 .../profile/impl/AbstractSAML2NameIDGeneratorTest.java    |  6 ++++--
 .../org/opensaml/soap/soap12/EncodingStyleBearing.java    |  5 +++--
 .../org/opensaml/soap/soap12/MustUnderstandBearing.java   |  5 +++--
 .../main/java/org/opensaml/soap/soap12/RelayBearing.java  |  5 +++--
 .../main/java/org/opensaml/soap/soap12/RoleBearing.java   |  5 +++--
 .../main/java/org/opensaml/soap/wsaddressing/Action.java  |  5 +++--
 .../main/java/org/opensaml/soap/wsaddressing/Address.java |  9 +++++----
 .../org/opensaml/soap/wsaddressing/AttributedQName.java   |  5 +++--
 .../org/opensaml/soap/wsaddressing/AttributedURI.java     |  5 +++--
 .../soap/wsaddressing/AttributedUnsignedLong.java         |  5 +++--
 .../org/opensaml/soap/wsaddressing/EndpointReference.java |  5 +++--
 .../opensaml/soap/wsaddressing/EndpointReferenceType.java |  5 +++--
 .../main/java/org/opensaml/soap/wsaddressing/FaultTo.java |  5 +++--
 .../main/java/org/opensaml/soap/wsaddressing/From.java    |  5 +++--
 .../soap/wsaddressing/IsReferenceParameterBearing.java    |  5 +++--
 .../java/org/opensaml/soap/wsaddressing/MessageID.java    |  5 +++--
 .../java/org/opensaml/soap/wsaddressing/Metadata.java     |  9 +++++----
 .../org/opensaml/soap/wsaddressing/ProblemAction.java     |  9 +++++----
 .../opensaml/soap/wsaddressing/ProblemHeaderQName.java    |  5 +++--
 .../java/org/opensaml/soap/wsaddressing/ProblemIRI.java   |  5 +++--
 .../opensaml/soap/wsaddressing/ReferenceParameters.java   |  9 +++++----
 .../java/org/opensaml/soap/wsaddressing/RelatesTo.java    | 13 +++++++------
 .../main/java/org/opensaml/soap/wsaddressing/ReplyTo.java |  5 +++--
 .../java/org/opensaml/soap/wsaddressing/RetryAfter.java   |  5 +++--
 .../java/org/opensaml/soap/wsaddressing/SoapAction.java   |  5 +++--
 .../src/main/java/org/opensaml/soap/wsaddressing/To.java  |  5 +++--
 .../src/main/java/org/opensaml/soap/wsfed/Address.java    |  9 +++++----
 .../src/main/java/org/opensaml/soap/wsfed/AppliesTo.java  |  9 +++++----
 .../java/org/opensaml/soap/wsfed/EndPointReference.java   |  9 +++++----
 .../opensaml/soap/wsfed/RequestSecurityTokenResponse.java |  9 +++++----
 .../org/opensaml/soap/wsfed/RequestedSecurityToken.java   |  9 +++++----
 .../main/java/org/opensaml/soap/wsfed/WSFedConstants.java | 14 ++++++++------
 .../src/main/java/org/opensaml/soap/wspolicy/All.java     |  5 +++--
 .../main/java/org/opensaml/soap/wspolicy/ExactlyOne.java  |  5 +++--
 .../org/opensaml/soap/wspolicy/OperatorContentType.java   |  5 +++--
 .../java/org/opensaml/soap/wspolicy/OptionalBearing.java  |  5 +++--
 .../src/main/java/org/opensaml/soap/wspolicy/Policy.java  |  7 ++++---
 .../java/org/opensaml/soap/wspolicy/PolicyAttachment.java |  5 +++--
 .../java/org/opensaml/soap/wspolicy/PolicyReference.java  | 13 +++++++------
 .../org/opensaml/soap/wspolicy/PolicyURIsBearing.java     |  5 +++--
 .../org/opensaml/soap/wspolicy/WSPolicyConstants.java     |  6 ++++--
 .../org/opensaml/soap/wssecurity/AttributedDateTime.java  |  5 +++--
 .../org/opensaml/soap/wssecurity/AttributedString.java    |  5 +++--
 .../java/org/opensaml/soap/wssecurity/AttributedURI.java  |  5 +++--
 .../org/opensaml/soap/wssecurity/BinarySecurityToken.java | 11 ++++++-----
 .../main/java/org/opensaml/soap/wssecurity/Created.java   |  5 +++--
 .../main/java/org/opensaml/soap/wssecurity/Embedded.java  | 11 ++++++-----
 58 files changed, 215 insertions(+), 158 deletions(-)

diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/BaseBearing.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/BaseBearing.java
index b9d6c999d..99f1b9a84 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/BaseBearing.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/BaseBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.core.xml;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -29,10 +30,10 @@ import net.shibboleth.shared.xml.XMLConstants;
 public interface BaseBearing {
 
     /** The <code>base</code> attribute local name. */
-    public static final String XML_BASE_ATTR_LOCAL_NAME = "base";
+    @Nonnull public static final String XML_BASE_ATTR_LOCAL_NAME = "base";
 
     /** The <code>xml:base</code> qualified attribute name. */
-    public static final QName XML_BASE_ATTR_NAME =
+    @Nonnull public static final QName XML_BASE_ATTR_NAME =
         new QName(XMLConstants.XML_NS, XML_BASE_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
 
     /**
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/IdBearing.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/IdBearing.java
index aad4d4af2..0ceda685b 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/IdBearing.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/IdBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.core.xml;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -29,10 +30,10 @@ import net.shibboleth.shared.xml.XMLConstants;
 public interface IdBearing {
 
     /** The <code>id</code> attribute local name. */
-    public static final String XML_ID_ATTR_LOCAL_NAME = "id";
+    @Nonnull public static final String XML_ID_ATTR_LOCAL_NAME = "id";
 
     /** The <code>xml:id</code> qualified attribute name. */
-    public static final QName XML_ID_ATTR_NAME =
+    @Nonnull public static final QName XML_ID_ATTR_NAME =
         new QName(XMLConstants.XML_NS, XML_ID_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
 
     /**
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/LangBearing.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/LangBearing.java
index 67e8170fa..d1a979c2d 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/LangBearing.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/LangBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.core.xml;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -29,10 +30,10 @@ import net.shibboleth.shared.xml.XMLConstants;
 public interface LangBearing {
 
     /** The <code>lang</code> attribute local name. */
-    public static final String XML_LANG_ATTR_LOCAL_NAME = "lang";
+    @Nonnull public static final String XML_LANG_ATTR_LOCAL_NAME = "lang";
 
     /** The <code>xml:lang</code> qualified attribute name. */
-    public static final QName XML_LANG_ATTR_NAME =
+    @Nonnull public static final QName XML_LANG_ATTR_NAME =
         new QName(XMLConstants.XML_NS, XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
 
     /**
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/SpaceBearing.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/SpaceBearing.java
index 1b9907301..4508be509 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/SpaceBearing.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/SpaceBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.core.xml;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -61,10 +62,10 @@ public interface SpaceBearing {
     }
 
     /** The <code>space</code> attribute local name. */
-    public static final String XML_SPACE_ATTR_LOCAL_NAME = "space";
+    @Nonnull public static final String XML_SPACE_ATTR_LOCAL_NAME = "space";
 
     /** The <code>xml:space</code> qualified attribute name. */
-    public static final QName XML_SPACE_ATTR_NAME =
+    @Nonnull public static final QName XML_SPACE_ATTR_NAME =
         new QName(XMLConstants.XML_NS, XML_SPACE_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
 
     /**
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java
index d4f26baa9..860decd24 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdrpi/PublicationInfo.java
@@ -60,8 +60,8 @@ public interface PublicationInfo extends SAMLObject {
     @Nonnull public static final QName CREATION_INSTANT_ATTRIB_QNAME =
             new QName(null, CREATION_INSTANT_ATTRIB_NAME, XMLConstants.DEFAULT_NS_PREFIX);
     
-    @Nonnull /** publication id attribute name. */
-    public static String PUBLICATION_ID_ATTRIB_NAME = "publicationId";
+    /** publication id attribute name. */
+    @Nonnull public static String PUBLICATION_ID_ATTRIB_NAME = "publicationId";
 
     /**
      * Get the publisher.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DisplayName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DisplayName.java
index 79663c80e..60bb18132 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DisplayName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DisplayName.java
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.metadata.LocalizedName;
 public interface DisplayName extends LocalizedName {
 
     /** Element local name. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DisplayName";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DisplayName";
     
     /** Default element name. */
     @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
index ced254886..fbd4631d7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
@@ -40,14 +40,14 @@ public interface Action extends SAMLObject, XSString {
     @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Action";
 
     /** Default element name. */
-    @Nullable static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAMLConstants.SAML1_PREFIX);
 
     /** Local name of the XSI type. */
     @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "ActionType";
 
     /** QName of the XSI type. */
-    @Nullable static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SAMLConstants.SAML1_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
 
     /** Name for the Namespace attribute. */
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Organization.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Organization.java
index 40680798b..dbde105b2 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Organization.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Organization.java
@@ -19,6 +19,7 @@ package org.opensaml.saml.saml2.metadata;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,17 +32,17 @@ import org.opensaml.saml.common.xml.SAMLConstants;
 public interface Organization extends SAMLObject, AttributeExtensibleXMLObject {
 
     /** Local name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Organization";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Organization";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAMLConstants.SAML20MD_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "OrganizationType";
+    @Nonnull  public static final String TYPE_LOCAL_NAME = "OrganizationType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20MD_NS, TYPE_LOCAL_NAME,
+    @Nonnull public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20MD_NS, TYPE_LOCAL_NAME,
             SAMLConstants.SAML20MD_PREFIX);
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
index d5fdbd6c3..bea7e7111 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
@@ -20,6 +20,7 @@ package org.opensaml.saml.metadata.resolver.index.impl;
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -127,7 +128,7 @@ public class RoleMetadataIndexTest extends XMLObjectBaseTestCase {
     
     public static class MyCustomRoleType extends RoleDescriptorImpl {
         
-        public static final QName TYPE_NAME = new QName("urn:test:metadata", "MyCustomRoleType", "custom");
+        @Nonnull public static final QName TYPE_NAME = new QName("urn:test:metadata", "MyCustomRoleType", "custom");
 
         protected MyCustomRoleType(String namespaceURI, String elementLocalName, String namespacePrefix) {
             super(namespaceURI, elementLocalName, namespacePrefix);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
index 089285d34..5c1fa70fc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/BaseAssertionValidationTest.java
@@ -34,6 +34,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -65,19 +66,19 @@ import org.testng.annotations.BeforeMethod;
 
 public class BaseAssertionValidationTest extends XMLObjectBaseTestCase {
     
-    public static final Duration CLOCK_SKEW = Duration.ofMinutes(5);
+    @Nonnull public static final Duration CLOCK_SKEW = Duration.ofMinutes(5);
     
-    public static final String PRINCIPAL_NAME = "gollum";
+    @Nonnull public static final String PRINCIPAL_NAME = "gollum";
     
-    public static final String ISSUER = "https://idp.example.org";
+    @Nonnull public static final String ISSUER = "https://idp.example.org";
     
-    public static final String SUBJECT_CONFIRMATION_RECIPIENT = "https://sp.example.com";
+    @Nonnull public static final String SUBJECT_CONFIRMATION_RECIPIENT = "https://sp.example.com";
     
-    public static final String SUBJECT_CONFIRMATION_ADDRESS = "10.1.2.3";
+    @Nonnull public static final String SUBJECT_CONFIRMATION_ADDRESS = "10.1.2.3";
     
-    public static final String SUBJECT_CONFIRMATION_IN_RESPONSE_TO = "id-123";
+    @Nonnull public static final String SUBJECT_CONFIRMATION_IN_RESPONSE_TO = "id-123";
     
-    public static final String AUTHN_STATEMENT_ADDRESS = "10.1.2.3";
+    @Nonnull public static final String AUTHN_STATEMENT_ADDRESS = "10.1.2.3";
     
     
     private Assertion assertion;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
index 18482fb49..0fde02414 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
@@ -717,7 +717,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
     
     public static class MockCondition extends AbstractXMLObject implements Condition {
         
-        public static final QName ELEMENT_NAME = new QName("urn:test:conditions", "MockCondition", "mock");
+        @Nonnull public static final QName ELEMENT_NAME = new QName("urn:test:conditions", "MockCondition", "mock");
         
         public MockCondition() {
             this(ELEMENT_NAME.getNamespaceURI(), ELEMENT_NAME.getLocalPart(), ELEMENT_NAME.getPrefix());
@@ -736,7 +736,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
     
     public static class MockCondition2 extends AbstractXMLObject implements Condition {
         
-        public static final QName ELEMENT_NAME = new QName("urn:test:conditions", "MockCondition2", "mock");
+        @Nonnull public static final QName ELEMENT_NAME = new QName("urn:test:conditions", "MockCondition2", "mock");
         
         public MockCondition2() {
             this(ELEMENT_NAME.getNamespaceURI(), ELEMENT_NAME.getLocalPart(), ELEMENT_NAME.getPrefix());
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 76b504372..324154aae 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
@@ -20,6 +20,8 @@ package org.opensaml.saml.saml2.profile.impl;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.FunctionSupport;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.SAMLException;
@@ -31,9 +33,9 @@ import org.testng.annotations.Test;
 /** Test for {@link AbstractSAML2NameIDGenerator}. */
 public class AbstractSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTestCase {
 
-    private static final String NAME_QUALIFIER = "https://idp.example.org";
+    @Nonnull private static final String NAME_QUALIFIER = "https://idp.example.org";
 
-    private static final String SP_NAME_QUALIFIER = "https://sp.example.org";
+    @Nonnull private static final String SP_NAME_QUALIFIER = "https://sp.example.org";
     
     @Test(expectedExceptions = ComponentInitializationException.class)
     public void testNoFormat() throws ComponentInitializationException {
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/EncodingStyleBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/EncodingStyleBearing.java
index b11f645ec..22f97ec7c 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/EncodingStyleBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/EncodingStyleBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.soap12;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -28,10 +29,10 @@ import org.opensaml.soap.util.SOAPConstants;
 public interface EncodingStyleBearing {
     
     /** The soap12:@encodingStyle attribute local name. */
-    public static final String SOAP12_ENCODING_STYLE_ATTR_LOCAL_NAME = "encodingStyle";
+    @Nonnull public static final String SOAP12_ENCODING_STYLE_ATTR_LOCAL_NAME = "encodingStyle";
 
     /** The soap12:@encodingStyle qualified attribute name. */
-    public static final QName SOAP12_ENCODING_STYLE_ATTR_NAME =
+    @Nonnull public static final QName SOAP12_ENCODING_STYLE_ATTR_NAME =
         new QName(SOAPConstants.SOAP12_NS, SOAP12_ENCODING_STYLE_ATTR_LOCAL_NAME, SOAPConstants.SOAP12_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/MustUnderstandBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/MustUnderstandBearing.java
index 4b8552842..d09d79eb7 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/MustUnderstandBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/MustUnderstandBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.soap12;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -29,10 +30,10 @@ import org.opensaml.soap.util.SOAPConstants;
 public interface MustUnderstandBearing {
     
     /** The soap12:@mustUnderstand attribute local name. */
-    public static final String SOAP12_MUST_UNDERSTAND_ATTR_LOCAL_NAME = "mustUnderstand";
+    @Nonnull public static final String SOAP12_MUST_UNDERSTAND_ATTR_LOCAL_NAME = "mustUnderstand";
 
     /** The soap12:@mustUnderstand qualified attribute name. */
-    public static final QName SOAP12_MUST_UNDERSTAND_ATTR_NAME =
+    @Nonnull public static final QName SOAP12_MUST_UNDERSTAND_ATTR_NAME =
         new QName(SOAPConstants.SOAP12_NS, SOAP12_MUST_UNDERSTAND_ATTR_LOCAL_NAME, SOAPConstants.SOAP12_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RelayBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RelayBearing.java
index 1607b4355..9c67beabb 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RelayBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RelayBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.soap12;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -29,10 +30,10 @@ import org.opensaml.soap.util.SOAPConstants;
 public interface RelayBearing {
     
     /** The soap12:@relay attribute local name. */
-    public static final String SOAP12_RELAY_ATTR_LOCAL_NAME = "relay";
+    @Nonnull public static final String SOAP12_RELAY_ATTR_LOCAL_NAME = "relay";
 
     /** The soap12:@relay qualified attribute name. */
-    public static final QName SOAP12_RELAY_ATTR_NAME =
+    @Nonnull public static final QName SOAP12_RELAY_ATTR_NAME =
         new QName(SOAPConstants.SOAP12_NS, SOAP12_RELAY_ATTR_LOCAL_NAME, SOAPConstants.SOAP12_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RoleBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RoleBearing.java
index 8aa6dc6d3..a070f5c6a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RoleBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/soap12/RoleBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.soap12;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
@@ -28,10 +29,10 @@ import org.opensaml.soap.util.SOAPConstants;
 public interface RoleBearing {
     
     /** The soap12:@role attribute local name. */
-    public static final String SOAP12_ROLE_ATTR_LOCAL_NAME = "role";
+    @Nonnull public static final String SOAP12_ROLE_ATTR_LOCAL_NAME = "role";
 
     /** The soap12:@role qualified attribute name. */
-    public static final QName SOAP12_ROLE_ATTR_NAME =
+    @Nonnull public static final QName SOAP12_ROLE_ATTR_NAME =
         new QName(SOAPConstants.SOAP12_NS, SOAP12_ROLE_ATTR_LOCAL_NAME, SOAPConstants.SOAP12_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Action.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Action.java
index e82cc8512..aaedbb775 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Action.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Action.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface Action extends AttributedURI {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Action";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Action";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Address.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Address.java
index a971c5072..ce5735973 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Address.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Address.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,15 +29,15 @@ import javax.xml.namespace.QName;
 public interface Address extends AttributedURI {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Address";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Address";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
     /** Anonymous address URI. */
-    public static final String ANONYMOUS = WSAddressingConstants.WSA_NS + "/anonymous";
+    @Nonnull public static final String ANONYMOUS = WSAddressingConstants.WSA_NS + "/anonymous";
 
     /** None address URI. */
-    public static final String NONE = WSAddressingConstants.WSA_NS + "/none";
+    @Nonnull public static final String NONE = WSAddressingConstants.WSA_NS + "/none";
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedQName.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedQName.java
index 61858f6cc..06c13746e 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedQName.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedQName.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,10 +32,10 @@ import org.opensaml.core.xml.schema.XSQName;
 public interface AttributedQName extends XSQName, AttributeExtensibleXMLObject, WSAddressingObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedQNameType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedQNameType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedURI.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedURI.java
index c647ea81b..a9b2b5d74 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedURI.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedURI.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,10 +32,10 @@ import org.opensaml.core.xml.schema.XSURI;
 public interface AttributedURI extends XSURI, AttributeExtensibleXMLObject, WSAddressingObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedURIType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedURIType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedUnsignedLong.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedUnsignedLong.java
index 6798a39b6..b30ae2c46 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedUnsignedLong.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/AttributedUnsignedLong.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,10 +31,10 @@ import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 public interface AttributedUnsignedLong extends AttributeExtensibleXMLObject, WSAddressingObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedUnsignedLongType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedUnsignedLongType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReference.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReference.java
index b542ec13d..40b0f634c 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReference.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReference.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -31,9 +32,9 @@ import javax.xml.namespace.QName;
 public interface EndpointReference extends EndpointReferenceType {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "EndpointReference";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "EndpointReference";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReferenceType.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReferenceType.java
index a40295428..fbc787c45 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReferenceType.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/EndpointReferenceType.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -32,10 +33,10 @@ public interface EndpointReferenceType
         extends AttributeExtensibleXMLObject, ElementExtensibleXMLObject, WSAddressingObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "EndpointReferenceType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "EndpointReferenceType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/FaultTo.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/FaultTo.java
index ddeafaf06..e74eec34d 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/FaultTo.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/FaultTo.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,9 +29,9 @@ import javax.xml.namespace.QName;
 public interface FaultTo extends EndpointReferenceType {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "FaultTo";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "FaultTo";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/From.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/From.java
index 3efc86145..be530c9c8 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/From.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/From.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,9 +29,9 @@ import javax.xml.namespace.QName;
 public interface From extends EndpointReferenceType {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "From";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "From";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/IsReferenceParameterBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/IsReferenceParameterBearing.java
index 467e5c0d4..acbec79fb 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/IsReferenceParameterBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/IsReferenceParameterBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.schema.XSBooleanValue;
@@ -28,10 +29,10 @@ import org.opensaml.core.xml.schema.XSBooleanValue;
 public interface IsReferenceParameterBearing {
 
     /** the <code>IsReferenceParameter</code> attribute local name. */
-    public static final String WSA_IS_REFERENCE_PARAMETER_ATTR_LOCAL_NAME = "IsReferenceParameter";
+    @Nonnull public static final String WSA_IS_REFERENCE_PARAMETER_ATTR_LOCAL_NAME = "IsReferenceParameter";
 
     /** the <code>wsa:IsReferenceParameter</code> qualified attribute name. */
-    public static final QName WSA_IS_REFERENCE_PARAMETER_ATTR_NAME =
+    @Nonnull public static final QName WSA_IS_REFERENCE_PARAMETER_ATTR_NAME =
         new QName(WSAddressingConstants.WSA_NS, WSA_IS_REFERENCE_PARAMETER_ATTR_LOCAL_NAME,
                 WSAddressingConstants.WSA_PREFIX);
 
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/MessageID.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/MessageID.java
index 34be22c5b..cd661b396 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/MessageID.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/MessageID.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface MessageID extends AttributedURI {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "MessageID";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "MessageID";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Metadata.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Metadata.java
index 76ee93398..6884c9efb 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Metadata.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/Metadata.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,17 +32,17 @@ import org.opensaml.core.xml.ElementExtensibleXMLObject;
 public interface Metadata extends AttributeExtensibleXMLObject, ElementExtensibleXMLObject, WSAddressingObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Metadata";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Metadata";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "MetadataType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "MetadataType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemAction.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemAction.java
index 912fb946c..cc9e6e3b4 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemAction.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemAction.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,17 +31,17 @@ import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 public interface ProblemAction extends AttributeExtensibleXMLObject, WSAddressingObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ProblemAction";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ProblemAction";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "ProblemActionType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "ProblemActionType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemHeaderQName.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemHeaderQName.java
index deab3c57b..ae4cfb0cc 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemHeaderQName.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemHeaderQName.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface ProblemHeaderQName extends AttributedQName {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ProblemHeaderQName";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ProblemHeaderQName";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemIRI.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemIRI.java
index dc250ddf0..e729cf806 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemIRI.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ProblemIRI.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface ProblemIRI extends AttributedURI {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ProblemIRI";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ProblemIRI";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReferenceParameters.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReferenceParameters.java
index 67f3ae4a1..b36df2a84 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReferenceParameters.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReferenceParameters.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -32,17 +33,17 @@ public interface ReferenceParameters
         extends AttributeExtensibleXMLObject, ElementExtensibleXMLObject, WSAddressingObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ReferenceParameters";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ReferenceParameters";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "ReferenceParametersType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "ReferenceParametersType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull  public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RelatesTo.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RelatesTo.java
index 2ca59a2dd..4deebc2f0 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RelatesTo.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RelatesTo.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,24 +32,24 @@ import org.opensaml.core.xml.schema.XSURI;
 public interface RelatesTo extends XSURI, AttributeExtensibleXMLObject, WSAddressingObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "RelatesTo";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "RelatesTo";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "RelatesToType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "RelatesToType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSAddressingConstants.WSA_NS, TYPE_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
     
     /** The RelationshipType attribute name. */
-    public static final String RELATIONSHIP_TYPE_ATTRIB_NAME = "RelationshipType";
+    @Nonnull public static final String RELATIONSHIP_TYPE_ATTRIB_NAME = "RelationshipType";
     
     /** RelationshipType attribute - Reply URI. */
-    public static final String RELATIONSHIP_TYPE_REPLY = WSAddressingConstants.WSA_NS + "/reply";
+    @Nonnull public static final String RELATIONSHIP_TYPE_REPLY = WSAddressingConstants.WSA_NS + "/reply";
     
     /**
      * Returns the RelationshipType attribute URI value.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReplyTo.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReplyTo.java
index 0252b1a2f..4e713960e 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReplyTo.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/ReplyTo.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,9 +29,9 @@ import javax.xml.namespace.QName;
 public interface ReplyTo extends EndpointReferenceType {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ReplyTo";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ReplyTo";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RetryAfter.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RetryAfter.java
index 64aeed058..3ec52f8b4 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RetryAfter.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/RetryAfter.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface RetryAfter extends AttributedUnsignedLong {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "RetryAfter";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "RetryAfter";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/SoapAction.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/SoapAction.java
index 70fff7786..a0a9dd8b2 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/SoapAction.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/SoapAction.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.schema.XSURI;
@@ -30,10 +31,10 @@ import org.opensaml.core.xml.schema.XSURI;
 public interface SoapAction extends XSURI, WSAddressingObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "SoapAction";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "SoapAction";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
  
 
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/To.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/To.java
index 8deddcbe0..481c6c715 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/To.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/To.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsaddressing;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,10 +29,10 @@ import javax.xml.namespace.QName;
 public interface To extends AttributedURI {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "To";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "To";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSAddressingConstants.WSA_NS, ELEMENT_LOCAL_NAME, WSAddressingConstants.WSA_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/Address.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/Address.java
index 56dcf8385..2fde08ea3 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/Address.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/Address.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsfed;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -25,17 +26,17 @@ import javax.xml.namespace.QName;
 public interface Address extends WSFedObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Address";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Address";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSADDRESS_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSADDRESS_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             WSFedConstants.WSADDRESS_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AddressType";
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AddressType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(WSFedConstants.WSADDRESS_NS, TYPE_LOCAL_NAME,
+    @Nonnull public static final QName TYPE_NAME = new QName(WSFedConstants.WSADDRESS_NS, TYPE_LOCAL_NAME,
             WSFedConstants.WSADDRESS_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/AppliesTo.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/AppliesTo.java
index 1f1261b4b..2fd818afb 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/AppliesTo.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/AppliesTo.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsfed;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -25,17 +26,17 @@ import javax.xml.namespace.QName;
 public interface AppliesTo extends WSFedObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AppliesTo";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AppliesTo";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSPOLICY_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSPOLICY_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             WSFedConstants.WSPOLICY_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AppliesToType";
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AppliesToType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(WSFedConstants.WSPOLICY_NS, TYPE_LOCAL_NAME,
+    @Nonnull public static final QName TYPE_NAME = new QName(WSFedConstants.WSPOLICY_NS, TYPE_LOCAL_NAME,
             WSFedConstants.WSPOLICY_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/EndPointReference.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/EndPointReference.java
index d1b57d576..6473b0d9d 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/EndPointReference.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/EndPointReference.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wsfed;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -26,17 +27,17 @@ import javax.xml.namespace.QName;
 public interface EndPointReference extends WSFedObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EndPointReference";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EndPointReference";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSADDRESS_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSADDRESS_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             WSFedConstants.WSADDRESS_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "EndPointReferenceType";
+    @Nonnull public static final String TYPE_LOCAL_NAME = "EndPointReferenceType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(WSFedConstants.WSADDRESS_NS, TYPE_LOCAL_NAME,
+    @Nonnull  public static final QName TYPE_NAME = new QName(WSFedConstants.WSADDRESS_NS, TYPE_LOCAL_NAME,
             WSFedConstants.WSADDRESS_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestSecurityTokenResponse.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestSecurityTokenResponse.java
index 94ff55d15..6bc684971 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestSecurityTokenResponse.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestSecurityTokenResponse.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wsfed;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -28,17 +29,17 @@ import javax.xml.namespace.QName;
 public interface RequestSecurityTokenResponse extends WSFedObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestSecurityTokenResponse";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestSecurityTokenResponse";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSFED11P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSFED11P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             WSFedConstants.WSFED1P_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "RequestSecurityTokenResponseType";
+    @Nonnull public static final String TYPE_LOCAL_NAME = "RequestSecurityTokenResponseType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(WSFedConstants.WSFED11P_NS, TYPE_LOCAL_NAME,
+    @Nonnull public static final QName TYPE_NAME = new QName(WSFedConstants.WSFED11P_NS, TYPE_LOCAL_NAME,
             WSFedConstants.WSFED1P_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestedSecurityToken.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestedSecurityToken.java
index 0cee20613..9ceda84d2 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestedSecurityToken.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/RequestedSecurityToken.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wsfed;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.XMLObject;
@@ -30,17 +31,17 @@ import org.opensaml.core.xml.XMLObject;
 public interface RequestedSecurityToken extends WSFedObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestedSecurityToken";
+    @Nonnull public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestedSecurityToken";
 
     /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSFED11P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(WSFedConstants.WSFED11P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             WSFedConstants.WSFED1P_PREFIX);
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "RequestedSecurityTokenType";
+    @Nonnull public static final String TYPE_LOCAL_NAME = "RequestedSecurityTokenType";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(WSFedConstants.WSFED11P_NS, TYPE_LOCAL_NAME,
+    @Nonnull public static final QName TYPE_NAME = new QName(WSFedConstants.WSFED11P_NS, TYPE_LOCAL_NAME,
             WSFedConstants.WSFED1P_PREFIX);
 
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/WSFedConstants.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/WSFedConstants.java
index 7dc1c7f2b..99cf18a0d 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/WSFedConstants.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsfed/WSFedConstants.java
@@ -17,26 +17,28 @@
 
 package org.opensaml.soap.wsfed;
 
+import javax.annotation.Nonnull;
+
 /** WS-Federation Constants. */
 public final class WSFedConstants {
 
     /** WSFED 1.1 protocol XML namespace. */
-    public static final String WSFED11P_NS = "http://schemas.xmlsoap.org/ws/2005/02/trust";
+    @Nonnull public static final String WSFED11P_NS = "http://schemas.xmlsoap.org/ws/2005/02/trust";
 
     /** WSFED 1.X Protocol QName prefix. */
-    public static final String WSFED1P_PREFIX = "wst";
+    @Nonnull public static final String WSFED1P_PREFIX = "wst";
 
     /** WSFED 1.X Policy XML namespace. */
-    public static final String WSPOLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    @Nonnull public static final String WSPOLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
 
     /** WSFED 1.X Policy QName prefix. */
-    public static final String WSPOLICY_PREFIX = "wsp";
+    @Nonnull public static final String WSPOLICY_PREFIX = "wsp";
 
     /** WSFED 1.X Address XML namespace. */
-    public static final String WSADDRESS_NS = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
+    @Nonnull public static final String WSADDRESS_NS = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
 
     /** WSFED 1.X Address QName prefix. */
-    public static final String WSADDRESS_PREFIX = "wsa";
+    @Nonnull public static final String WSADDRESS_PREFIX = "wsa";
     
     /** Constructor. */
     private WSFedConstants() {
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/All.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/All.java
index 37ba4ee3c..42e5a5d89 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/All.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/All.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -27,10 +28,10 @@ import javax.xml.namespace.QName;
 public interface All extends OperatorContentType {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "All";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "All";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSPolicyConstants.WSP_NS, ELEMENT_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/ExactlyOne.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/ExactlyOne.java
index b94e2ed3a..87b1cb688 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/ExactlyOne.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/ExactlyOne.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -27,10 +28,10 @@ import javax.xml.namespace.QName;
 public interface ExactlyOne extends OperatorContentType {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "ExactlyOne";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "ExactlyOne";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSPolicyConstants.WSP_NS, ELEMENT_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OperatorContentType.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OperatorContentType.java
index ce69cce55..e427ed760 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OperatorContentType.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OperatorContentType.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wspolicy;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.XMLObject;
@@ -29,10 +30,10 @@ import org.opensaml.core.xml.XMLObject;
 public interface OperatorContentType extends WSPolicyObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "OperatorContentType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "OperatorContentType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSPolicyConstants.WSP_NS, TYPE_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OptionalBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OptionalBearing.java
index e5ba2acaf..daa6b44d9 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OptionalBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/OptionalBearing.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.schema.XSBooleanValue;
@@ -27,10 +28,10 @@ import org.opensaml.core.xml.schema.XSBooleanValue;
 public interface OptionalBearing {
     
     /** The wsp:@Optional attribute local name. */
-    public static final String WSP_OPTIONAL_ATTR_LOCAL_NAME = "Optional";
+    @Nonnull public static final String WSP_OPTIONAL_ATTR_LOCAL_NAME = "Optional";
 
     /** The wsp:@Optional qualified attribute name. */
-    public static final QName WSP_OPTIONAL_ATTR_NAME =
+    @Nonnull public static final QName WSP_OPTIONAL_ATTR_NAME =
         new QName(WSPolicyConstants.WSP_NS, WSP_OPTIONAL_ATTR_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/Policy.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/Policy.java
index e351c171a..94ccb933a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/Policy.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/Policy.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,14 +32,14 @@ import org.opensaml.soap.wssecurity.IdBearing;
 public interface Policy extends OperatorContentType, AttributeExtensibleXMLObject, IdBearing {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Policy";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Policy";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSPolicyConstants.WSP_NS, ELEMENT_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
 
     /** The wsp:Policy/@Name attribute local name. */
-    public static final String NAME_ATTRIB_NAME = "Name";
+    @Nonnull public static final String NAME_ATTRIB_NAME = "Name";
 
     /**
      * Returns the wsp:Policy/@Name attribute value.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyAttachment.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyAttachment.java
index 432aac1d9..986d2fc1a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyAttachment.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyAttachment.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wspolicy;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -32,10 +33,10 @@ import org.opensaml.core.xml.ElementExtensibleXMLObject;
 public interface PolicyAttachment extends WSPolicyObject, ElementExtensibleXMLObject, AttributeExtensibleXMLObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "PolicyAttachment";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "PolicyAttachment";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSPolicyConstants.WSP_NS, ELEMENT_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyReference.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyReference.java
index 66caaadc7..0f779461d 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyReference.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyReference.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -30,23 +31,23 @@ import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 public interface PolicyReference extends AttributeExtensibleXMLObject, WSPolicyObject {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "PolicyReference";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "PolicyReference";
 
     /** Default element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSPolicyConstants.WSP_NS, ELEMENT_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
 
     /** The wsp:PolicyReference/@URI attribute local name. */
-    public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull public static final String URI_ATTRIB_NAME = "URI";
 
     /** The wsp:PolicyReference/@Digest attribute local name. */
-    public static final String DIGEST_ATTRIB_NAME = "Digest";
+    @Nonnull public static final String DIGEST_ATTRIB_NAME = "Digest";
 
     /** The wsp:PolicyReference/@Digest attribute local name. */
-    public static final String DIGEST_ALGORITHM_ATTRIB_NAME = "DigestAlgorithm";
+    @Nonnull public static final String DIGEST_ALGORITHM_ATTRIB_NAME = "DigestAlgorithm";
 
     /** The default wsp:PolicyReference/@DigestAlgorithm attribute value. */
-    public static final String DIGEST_ALGORITHM_SHA1EXC = WSPolicyConstants.WSP_NS + "/Sha1Exc";
+    @Nonnull public static final String DIGEST_ALGORITHM_SHA1EXC = WSPolicyConstants.WSP_NS + "/Sha1Exc";
 
     /**
      * Returns the wsp:PolicyReference/@URI attribute value.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyURIsBearing.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyURIsBearing.java
index ecdb37923..69a02c589 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyURIsBearing.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/PolicyURIsBearing.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wspolicy;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -27,10 +28,10 @@ import javax.xml.namespace.QName;
 public interface PolicyURIsBearing {
     
     /** The wsp:@PolicyURIs attribute local name. */
-    public static final String WSP_POLICY_URIS_ATTR_LOCAL_NAME = "PolicyURIs";
+    @Nonnull public static final String WSP_POLICY_URIS_ATTR_LOCAL_NAME = "PolicyURIs";
 
     /** The wsp:@PolicyURIs qualified attribute name. */
-    public static final QName WSP_POLICY_URIS_ATTR_NAME =
+    @Nonnull public static final QName WSP_POLICY_URIS_ATTR_NAME =
         new QName(WSPolicyConstants.WSP_NS, WSP_POLICY_URIS_ATTR_LOCAL_NAME, WSPolicyConstants.WSP_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/WSPolicyConstants.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/WSPolicyConstants.java
index 89bd082f5..c948a5a9a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/WSPolicyConstants.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wspolicy/WSPolicyConstants.java
@@ -17,6 +17,8 @@
 
 package org.opensaml.soap.wspolicy;
 
+import javax.annotation.Nonnull;
+
 /**
  * WS-Policy 1.2 constants.
  * 
@@ -26,10 +28,10 @@ package org.opensaml.soap.wspolicy;
 public final class WSPolicyConstants {
 
     /** WS-Policy namespace. */
-    public static final String WSP_NS= "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    @Nonnull public static final String WSP_NS= "http://schemas.xmlsoap.org/ws/2004/09/policy";
 
     /** WS-Policy namespace prefix. */
-    public static final String WSP_PREFIX= "wsp";
+    @Nonnull public static final String WSP_PREFIX= "wsp";
     
     /** Constructor. Private to prevent instantiation. */
     private WSPolicyConstants() { }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedDateTime.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedDateTime.java
index 5c190c637..d4aaec37c 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedDateTime.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedDateTime.java
@@ -19,6 +19,7 @@ package org.opensaml.soap.wssecurity;
 
 import java.time.Instant;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -31,10 +32,10 @@ import org.opensaml.core.xml.schema.XSString;
 public interface AttributedDateTime extends XSString, IdBearing, AttributeExtensibleXMLObject, WSSecurityObject  {
 
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedDateTime"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedDateTime"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSSecurityConstants.WSU_NS, TYPE_LOCAL_NAME, WSSecurityConstants.WSU_PREFIX);
     
     /**
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedString.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedString.java
index 055f15fd1..fdb953a9f 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedString.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedString.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wssecurity;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -28,10 +29,10 @@ import org.opensaml.core.xml.schema.XSString;
 public interface AttributedString extends XSString, IdBearing, AttributeExtensibleXMLObject, WSSecurityObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedString"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedString"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSSecurityConstants.WSSE_NS, TYPE_LOCAL_NAME, WSSecurityConstants.WSSE_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedURI.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedURI.java
index 64382a6e6..9c54914df 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedURI.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/AttributedURI.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wssecurity;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -28,10 +29,10 @@ import org.opensaml.core.xml.schema.XSURI;
 public interface AttributedURI extends XSURI, IdBearing, AttributeExtensibleXMLObject, WSSecurityObject {
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AttributedURI"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "AttributedURI"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSSecurityConstants.WSU_NS, TYPE_LOCAL_NAME, WSSecurityConstants.WSU_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/BinarySecurityToken.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/BinarySecurityToken.java
index 55a6198e6..3d7e962d3 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/BinarySecurityToken.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/BinarySecurityToken.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wssecurity;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -25,21 +26,21 @@ import javax.xml.namespace.QName;
 public interface BinarySecurityToken extends EncodedString {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "BinarySecurityToken";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "BinarySecurityToken";
 
     /** Qualified element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSSecurityConstants.WSSE_NS, ELEMENT_LOCAL_NAME, WSSecurityConstants.WSSE_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "BinarySecurityTokenType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "BinarySecurityTokenType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSSecurityConstants.WSSE_NS, TYPE_LOCAL_NAME, WSSecurityConstants.WSSE_PREFIX);
     
     /** The ValueType attribute name. */
-    public static final String VALUE_TYPE_ATTRIB_NAME = "ValueType";
+    @Nonnull public static final String VALUE_TYPE_ATTRIB_NAME = "ValueType";
     
     /**
      * Returns the ValueType attribute URI value.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Created.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Created.java
index 0ca36e086..01aaa5480 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Created.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Created.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wssecurity;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 /**
@@ -26,10 +27,10 @@ import javax.xml.namespace.QName;
 public interface Created extends AttributedDateTime {
 
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Created";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Created";
 
     /** Qualified element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSSecurityConstants.WSU_NS, ELEMENT_LOCAL_NAME, WSSecurityConstants.WSU_PREFIX);
 
 }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Embedded.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Embedded.java
index 8ff1b9f08..aae8fe1cd 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Embedded.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/Embedded.java
@@ -17,6 +17,7 @@
 
 package org.opensaml.soap.wssecurity;
 
+import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -29,21 +30,21 @@ import org.opensaml.core.xml.ElementExtensibleXMLObject;
 public interface Embedded extends AttributeExtensibleXMLObject, ElementExtensibleXMLObject, WSSecurityObject {
     
     /** Element local name. */
-    public static final String ELEMENT_LOCAL_NAME = "Embedded";
+    @Nonnull public static final String ELEMENT_LOCAL_NAME = "Embedded";
 
     /** Qualified element name. */
-    public static final QName ELEMENT_NAME =
+    @Nonnull public static final QName ELEMENT_NAME =
         new QName(WSSecurityConstants.WSSE_NS, ELEMENT_LOCAL_NAME, WSSecurityConstants.WSSE_PREFIX);
     
     /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "EmbeddedType"; 
+    @Nonnull public static final String TYPE_LOCAL_NAME = "EmbeddedType"; 
         
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = 
+    @Nonnull public static final QName TYPE_NAME = 
         new QName(WSSecurityConstants.WSSE_NS, TYPE_LOCAL_NAME, WSSecurityConstants.WSSE_PREFIX);
 
     /** The wsse:Embedded/@ValueType attribute local name. */
-    public static final String VALUE_TYPE_ATTRIB_NAME= "ValueType";
+    @Nonnull public static final String VALUE_TYPE_ATTRIB_NAME= "ValueType";
 
     /**
      * Returns the ValueType attribute URI value.

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


More information about the commits mailing list