[java-opensaml] branch main updated: Strip public keywords from interfaces and remove 2 default methods.

Tue Mar 28 15:18:37 UTC 2023

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

scantor 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=5f8393226e12588cc390e170d94f71684c28e364

The following commit(s) were added to refs/heads/main by this push:
     new 5f8393226 Strip public keywords from interfaces and remove 2 default methods.
5f8393226 is described below

commit 5f8393226e12588cc390e170d94f71684c28e364
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 28 11:18:35 2023 -0400

    Strip public keywords from interfaces and remove 2 default methods.
---
 .../xmlsec/encryption/AgreementMethod.java         | 26 ++++++-------
 .../xmlsec/encryption/AlgorithmIdentifierType.java | 14 +++----
 .../opensaml/xmlsec/encryption/CarriedKeyName.java |  4 +-
 .../org/opensaml/xmlsec/encryption/CipherData.java | 16 ++++----
 .../xmlsec/encryption/CipherReference.java         | 18 ++++-----
 .../opensaml/xmlsec/encryption/CipherValue.java    |  4 +-
 .../xmlsec/encryption/ConcatKDFParams.java         | 22 +++++------
 .../org/opensaml/xmlsec/encryption/DHKeyValue.java | 32 ++++++++--------
 .../opensaml/xmlsec/encryption/DataReference.java  |  4 +-
 .../org/opensaml/xmlsec/encryption/DerivedKey.java | 32 ++++++++--------
 .../opensaml/xmlsec/encryption/DerivedKeyName.java |  4 +-
 .../opensaml/xmlsec/encryption/EncryptedData.java  |  8 ++--
 .../opensaml/xmlsec/encryption/EncryptedKey.java   | 22 +++++------
 .../opensaml/xmlsec/encryption/EncryptedType.java  | 44 +++++++++++-----------
 .../xmlsec/encryption/EncryptionMethod.java        | 22 +++++------
 .../xmlsec/encryption/EncryptionProperties.java    | 17 +++++----
 .../xmlsec/encryption/EncryptionProperty.java      | 20 +++++-----
 .../org/opensaml/xmlsec/encryption/Generator.java  |  4 +-
 .../opensaml/xmlsec/encryption/IterationCount.java |  4 +-
 .../org/opensaml/xmlsec/encryption/KANonce.java    |  4 +-
 .../xmlsec/encryption/KeyDerivationMethod.java     | 10 ++---
 .../org/opensaml/xmlsec/encryption/KeyLength.java  |  4 +-
 .../opensaml/xmlsec/encryption/KeyReference.java   |  4 +-
 .../org/opensaml/xmlsec/encryption/KeySize.java    |  8 ++--
 .../java/org/opensaml/xmlsec/encryption/MGF.java   |  8 ++--
 .../opensaml/xmlsec/encryption/MasterKeyName.java  |  4 +-
 .../org/opensaml/xmlsec/encryption/OAEPparams.java |  4 +-
 .../xmlsec/encryption/OriginatorKeyInfo.java       |  4 +-
 .../opensaml/xmlsec/encryption/OtherSource.java    |  4 +-
 .../java/org/opensaml/xmlsec/encryption/P.java     |  4 +-
 .../opensaml/xmlsec/encryption/PBKDF2Params.java   | 24 ++++++------
 .../java/org/opensaml/xmlsec/encryption/PRF.java   |  8 ++--
 .../org/opensaml/xmlsec/encryption/Parameters.java |  4 +-
 .../opensaml/xmlsec/encryption/PgenCounter.java    |  4 +-
 .../org/opensaml/xmlsec/encryption/Public.java     |  4 +-
 .../java/org/opensaml/xmlsec/encryption/Q.java     |  4 +-
 .../xmlsec/encryption/RecipientKeyInfo.java        |  4 +-
 .../opensaml/xmlsec/encryption/ReferenceList.java  | 11 +++---
 .../opensaml/xmlsec/encryption/ReferenceType.java  | 10 ++---
 .../java/org/opensaml/xmlsec/encryption/Salt.java  | 12 +++---
 .../java/org/opensaml/xmlsec/encryption/Seed.java  |  4 +-
 .../org/opensaml/xmlsec/encryption/Specified.java  |  4 +-
 .../org/opensaml/xmlsec/encryption/Transforms.java | 11 +++---
 .../xmlsec/encryption/XMLEncryptionBuilder.java    |  2 +-
 .../opensaml/xmlsec/signature/CryptoBinary.java    |  8 ++--
 .../xmlsec/signature/DEREncodedKeyValue.java       | 14 +++----
 .../org/opensaml/xmlsec/signature/DSAKeyValue.java | 36 +++++++++---------
 .../opensaml/xmlsec/signature/DigestMethod.java    | 14 +++----
 .../org/opensaml/xmlsec/signature/ECKeyValue.java  | 26 ++++++-------
 .../org/opensaml/xmlsec/signature/ECPointType.java |  4 +-
 .../org/opensaml/xmlsec/signature/Exponent.java    |  4 +-
 .../main/java/org/opensaml/xmlsec/signature/G.java |  4 +-
 .../main/java/org/opensaml/xmlsec/signature/J.java |  4 +-
 .../org/opensaml/xmlsec/signature/KeyInfo.java     | 41 ++++++++++----------
 .../xmlsec/signature/KeyInfoReference.java         | 20 +++++-----
 .../org/opensaml/xmlsec/signature/KeyName.java     |  4 +-
 .../org/opensaml/xmlsec/signature/KeyValue.java    | 37 ++++++++----------
 .../org/opensaml/xmlsec/signature/MgmtData.java    |  4 +-
 .../org/opensaml/xmlsec/signature/Modulus.java     |  4 +-
 .../org/opensaml/xmlsec/signature/NamedCurve.java  | 14 +++----
 .../main/java/org/opensaml/xmlsec/signature/P.java |  4 +-
 .../org/opensaml/xmlsec/signature/PGPData.java     | 16 ++++----
 .../org/opensaml/xmlsec/signature/PGPKeyID.java    |  4 +-
 .../opensaml/xmlsec/signature/PGPKeyPacket.java    |  4 +-
 .../org/opensaml/xmlsec/signature/PgenCounter.java |  4 +-
 .../org/opensaml/xmlsec/signature/PublicKey.java   |  4 +-
 .../main/java/org/opensaml/xmlsec/signature/Q.java |  4 +-
 .../org/opensaml/xmlsec/signature/RSAKeyValue.java | 16 ++++----
 .../opensaml/xmlsec/signature/RetrievalMethod.java | 24 ++++++------
 .../org/opensaml/xmlsec/signature/SPKIData.java    | 15 ++++----
 .../org/opensaml/xmlsec/signature/SPKISexp.java    |  4 +-
 .../java/org/opensaml/xmlsec/signature/Seed.java   |  4 +-
 .../org/opensaml/xmlsec/signature/Signature.java   | 31 +++++++--------
 .../org/opensaml/xmlsec/signature/Transform.java   | 21 ++++++-----
 .../org/opensaml/xmlsec/signature/Transforms.java  | 11 +++---
 .../org/opensaml/xmlsec/signature/X509CRL.java     |  4 +-
 .../opensaml/xmlsec/signature/X509Certificate.java |  4 +-
 .../org/opensaml/xmlsec/signature/X509Data.java    | 25 ++++++------
 .../org/opensaml/xmlsec/signature/X509Digest.java  | 14 +++----
 .../opensaml/xmlsec/signature/X509IssuerName.java  |  4 +-
 .../xmlsec/signature/X509IssuerSerial.java         | 16 ++++----
 .../org/opensaml/xmlsec/signature/X509SKI.java     |  4 +-
 .../xmlsec/signature/X509SerialNumber.java         | 12 +++---
 .../opensaml/xmlsec/signature/X509SubjectName.java |  4 +-
 .../xmlsec/signature/XMLSignatureBuilder.java      |  2 +-
 .../java/org/opensaml/xmlsec/signature/XPath.java  |  4 +-
 .../main/java/org/opensaml/xmlsec/signature/Y.java |  4 +-
 87 files changed, 493 insertions(+), 489 deletions(-)

diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AgreementMethod.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AgreementMethod.java
index af7e00a8f..27d8be117 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AgreementMethod.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AgreementMethod.java
@@ -33,76 +33,76 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface AgreementMethod extends XMLObject, ElementExtensibleXMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AgreementMethod";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "AgreementMethod";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "AgreementMethodType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "AgreementMethodType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIBUTE_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIBUTE_NAME = "Algorithm";
 
     /**
      * Gets the algorithm URI attribute value for this agreement method.
      * 
      * @return the algorithm URI attribute value
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
 
     /**
      * Sets the algorithm URI attribute value for this agreement method.
      * 
      * @param newAlgorithm the new algorithm URI attribute value
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
 
     /**
      * Get the nonce child element used to introduce variability into the generation of keying material.
      * 
      * @return the KA-Nonce child element
      */
-    @Nullable public KANonce getKANonce();
+    @Nullable KANonce getKANonce();
 
     /**
      * Set the nonce child element used to introduce variability into the generation of keying material.
      * 
      * @param newKANonce the new KA-Nonce child element
      */
-    public void setKANonce(@Nullable final KANonce newKANonce);
+    void setKANonce(@Nullable final KANonce newKANonce);
 
     /**
      * Get the child element containing the key generation material for the originator.
      * 
      * @return the OriginatorKeyInfo child element
      */
-    @Nullable public OriginatorKeyInfo getOriginatorKeyInfo();
+    @Nullable OriginatorKeyInfo getOriginatorKeyInfo();
 
     /**
      * Set the child element containing the key generation material for the originator.
      * 
      * @param newOriginatorKeyInfo the new OriginatorKeyInfo child element
      */
-    public void setOriginatorKeyInfo(@Nullable final OriginatorKeyInfo newOriginatorKeyInfo);
+    void setOriginatorKeyInfo(@Nullable final OriginatorKeyInfo newOriginatorKeyInfo);
 
     /**
      * Get the child element containing the key generation material for the recipient.
      * 
      * @return the RecipientKeyInfo child element
      */
-    @Nullable public RecipientKeyInfo getRecipientKeyInfo();
+    @Nullable RecipientKeyInfo getRecipientKeyInfo();
 
     /**
      * Set the child element containing the key generation material for the recipient.
      * 
      * @param newRecipientKeyInfo the new RecipientKeyInfo child element
      */
-    public void setRecipientKeyInfo(@Nullable final RecipientKeyInfo newRecipientKeyInfo);
+    void setRecipientKeyInfo(@Nullable final RecipientKeyInfo newRecipientKeyInfo);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifierType.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifierType.java
index e9783ec9f..e35a91178 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifierType.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifierType.java
@@ -32,41 +32,41 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface AlgorithmIdentifierType extends XMLObject {
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "AlgorithmIdentifierType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "AlgorithmIdentifierType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC11_PREFIX);
     
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
 
     /**
      * Gets the algorithm URI attribute.
      * 
      * @return the Algorithm attribute URI attribute string
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
 
     /**
      * Sets the algorithm URI attribute.
      * 
      * @param newAlgorithm the new Algorithm URI attribute string
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
     
     /**
      * Gets the Parameters child element.
      * 
      * @return the Parameters child element
      */
-    @Nullable public XMLObject getParameters();
+    @Nullable XMLObject getParameters();
 
     /**
      * Sets the Parameters child element.
      * 
      * @param newParameters the new Parameters child element
      */
-    public void setParameters(@Nullable final XMLObject newParameters);
+    void setParameters(@Nullable final XMLObject newParameters);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CarriedKeyName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CarriedKeyName.java
index 3c94370ed..517a1300d 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CarriedKeyName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CarriedKeyName.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface CarriedKeyName extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "CarriedKeyName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "CarriedKeyName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherData.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherData.java
index 97576efa9..e02384f83 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherData.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherData.java
@@ -32,17 +32,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface CipherData extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherData";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherData";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "CipherDataType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "CipherDataType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /**
@@ -50,26 +50,26 @@ public interface CipherData extends XMLObject {
      * 
      * @return base64-encoded encrypted value
      */
-    @Nullable public CipherValue getCipherValue();
+    @Nullable CipherValue getCipherValue();
 
     /**
      * Set the base64-encoded data representing the encrypted form of the plaintext data.
      * 
      * @param newCipherValue the new base64-encoded encrypted data
      */
-    public void setCipherValue(@Nullable final CipherValue newCipherValue);
+    void setCipherValue(@Nullable final CipherValue newCipherValue);
 
     /**
      * Get the CipherReference which points to the location encrypted data.
      * 
      * @return CipherReference child element representing the encrypted data
      */
-    @Nullable public CipherReference getCipherReference();
+    @Nullable CipherReference getCipherReference();
 
     /**
      * Get the CipherReference which points to the location encrypted data.
      * 
      * @param newCipherReference the new CipherReference child element
      */
-    public void setCipherReference(@Nullable final CipherReference newCipherReference);
+    void setCipherReference(@Nullable final CipherReference newCipherReference);
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherReference.java
index fb4273ed4..53b9c909a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherReference.java
@@ -32,48 +32,48 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface CipherReference extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherReference";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherReference";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "CipherReferenceType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "CipherReferenceType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** URI attribute name. */
-    @Nonnull @NotEmpty public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull @NotEmpty static final String URI_ATTRIB_NAME = "URI";
 
     /**
      * Get the URI attribute that describes from where to deference the encrypted data.
      * 
      * @return the URI attribute string
      */
-    @Nullable public String getURI();
+    @Nullable String getURI();
 
     /**
      * Set the URI attribute that describes from where to deference the encrypted data.
      * 
      * @param newURI the new URI attribute string value
      */
-    public void setURI(@Nullable final String newURI);
+    void setURI(@Nullable final String newURI);
 
     /**
      * Get the Transforms child element, which describes which transformations to apply when dereferencing the data.
      * 
      * @return the Transforms child element
      */
-    @Nullable public Transforms getTransforms();
+    @Nullable Transforms getTransforms();
 
     /**
      * Set the Transforms child element, which describes which transformations to apply when dereferencing the data.
      * 
      * @param newTransforms the new Transforms child element
      */
-    public void setTransforms(@Nullable final Transforms newTransforms);
+    void setTransforms(@Nullable final Transforms newTransforms);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherValue.java
index ed90a2626..3e39b773d 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/CipherValue.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface CipherValue extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "CipherValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ConcatKDFParams.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ConcatKDFParams.java
index fee7e8f9a..a85f2b45c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ConcatKDFParams.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ConcatKDFParams.java
@@ -30,36 +30,36 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 /**
  * XMLObject representing XML Encryption 1.1 ConcatKDFParams element.
  */
-public interface ConcatKDFParams extends XMLObject {
+interface ConcatKDFParams extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ConcatKDFParams";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "ConcatKDFParams";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME,
-      EncryptionConstants.XMLENC11_PREFIX);
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
+            new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "ConcatKDFParamsType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "ConcatKDFParamsType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** AlgorithmID attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ID_ATTRIBUTE_NAME = "AlgorithmID";
+    @Nonnull @NotEmpty static final String ALGORITHM_ID_ATTRIBUTE_NAME = "AlgorithmID";
 
     /** PartyUInfo attribute name. */
-    @Nonnull @NotEmpty public static final String PARTY_U_INFO_ATTRIBUTE_NAME = "PartyUInfo";
+    @Nonnull @NotEmpty static final String PARTY_U_INFO_ATTRIBUTE_NAME = "PartyUInfo";
 
     /** PartyVInfo attribute name. */
-    @Nonnull @NotEmpty public static final String PARTY_V_INFO_ATTRIBUTE_NAME = "PartyVInfo";
+    @Nonnull @NotEmpty static final String PARTY_V_INFO_ATTRIBUTE_NAME = "PartyVInfo";
 
     /** SuppPubInfo attribute name. */
-    @Nonnull @NotEmpty public static final String SUPP_PUB_INFO_ATTRIBUTE_NAME = "SuppPubInfo";
+    @Nonnull @NotEmpty static final String SUPP_PUB_INFO_ATTRIBUTE_NAME = "SuppPubInfo";
 
     /** SuppPrivInfo attribute name. */
-    @Nonnull @NotEmpty public static final String SUPP_PRIV_INFO_ATTRIBUTE_NAME = "SuppPrivInfo";
+    @Nonnull @NotEmpty static final String SUPP_PRIV_INFO_ATTRIBUTE_NAME = "SuppPrivInfo";
 
     /**
      * Gets the digest method.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DHKeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DHKeyValue.java
index 0b52b8dab..66f352735 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DHKeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DHKeyValue.java
@@ -32,17 +32,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DHKeyValue extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DHKeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DHKeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "DHKeyValueType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "DHKeyValueType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /**
@@ -50,83 +50,83 @@ public interface DHKeyValue extends XMLObject {
      * 
      * @return the P child element
      */
-    @Nullable public P getP();
+    @Nullable P getP();
 
     /**
      * Set the P child element.
      * 
      * @param newP the new P child element
      */
-    public void setP(@Nullable final P newP);
+    void setP(@Nullable final P newP);
 
     /**
      * Get the Q child element.
      * 
      * @return the Q child element
      */
-    @Nullable public Q getQ();
+    @Nullable Q getQ();
 
     /**
      * Set the Q child element.
      * 
      * @param newQ the new Q child element
      */
-    public void setQ(@Nullable final Q newQ);
+    void setQ(@Nullable final Q newQ);
 
     /**
      * Get the Generator child element.
      * 
      * @return the Generator child element
      */
-    @Nullable public Generator getGenerator();
+    @Nullable Generator getGenerator();
 
     /**
      * Set the G child element.
      * 
      * @param newGenerator the new G child element
      */
-    public void setGenerator(@Nullable final Generator newGenerator);
+    void setGenerator(@Nullable final Generator newGenerator);
 
     /**
      * Get the Public element.
      * 
      * @return the Public element
      */
-    @Nullable public Public getPublic();
+    @Nullable Public getPublic();
 
     /**
      * Set the Public element.
      * 
      * @param newPublic the new Public child element
      */
-    public void setPublic(@Nullable final Public newPublic);
+    void setPublic(@Nullable final Public newPublic);
 
     /**
      * Get the seed element.
      * 
      * @return the seed element
      */
-    @Nullable public Seed getSeed();
+    @Nullable Seed getSeed();
 
     /**
      * Set the seed element.
      * 
      * @param newSeed new seed element
      */
-    public void setSeed(@Nullable final Seed newSeed);
+    void setSeed(@Nullable final Seed newSeed);
 
     /**
      * Get the pgenCounter element.
      * 
      * @return the pgenCounter element
      */
-    @Nullable public PgenCounter getPgenCounter();
+    @Nullable PgenCounter getPgenCounter();
 
     /**
      * Set the pgenCounter element.
      * 
      * @param newPgenCounter new pgenCounter element
      */
-    public void setPgenCounter(@Nullable final PgenCounter newPgenCounter);
+    void setPgenCounter(@Nullable final PgenCounter newPgenCounter);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DataReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DataReference.java
index bcaaa496f..d681817c8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DataReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DataReference.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DataReference extends ReferenceType {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DataReference";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DataReference";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKey.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKey.java
index 11144e2ed..3ea07f803 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKey.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKey.java
@@ -29,86 +29,86 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 /**
  * XMLObject representing XML Encryption 1.1 DerivedKey element.
  */
-public interface DerivedKey extends XMLObject {
+interface DerivedKey extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DerivedKey";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DerivedKey";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "DerivedKeyType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "DerivedKeyType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Recipient attribute name. */
-    @Nonnull @NotEmpty public static final String RECIPIENT_ATTRIBUTE_NAME = "Recipient";
+    @Nonnull @NotEmpty static final String RECIPIENT_ATTRIBUTE_NAME = "Recipient";
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIBUTE_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIBUTE_NAME = "Id";
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String TYPE_ATTRIBUTE_NAME = "Type";
+    @Nonnull @NotEmpty static final String TYPE_ATTRIBUTE_NAME = "Type";
     
     /**
      * Get the KeyDerivationMethod child element.
      * 
      * @return the element
      */
-    @Nullable public KeyDerivationMethod getKeyDerivationMethod();
+    @Nullable KeyDerivationMethod getKeyDerivationMethod();
     
     /**
      * Set the KeyDerivationMethod child element.
      * 
      * @param method the key derivation method
      */
-    public void setKeyDerivationMethod(@Nullable final KeyDerivationMethod method);
+    void setKeyDerivationMethod(@Nullable final KeyDerivationMethod method);
 
     /**
      * Get the ReferenceList child element.
      * 
      * @return the element
      */
-    @Nullable public ReferenceList getReferenceList();
+    @Nullable ReferenceList getReferenceList();
     
     /**
      * Set the ReferenceList child element.
      * 
      * @param referenceList the list
      */
-    public void setReferenceList(@Nullable final ReferenceList referenceList);
+    void setReferenceList(@Nullable final ReferenceList referenceList);
 
     /**
      * Get the DerivedKeyName child element.
      * 
      * @return the element
      */
-    @Nullable public DerivedKeyName getDerivedKeyName();
+    @Nullable DerivedKeyName getDerivedKeyName();
     
     /**
      * Set the DerivedKeyName child element.
      * 
      * @param name the key name
      */
-    public void setDerivedKeyName(@Nullable final DerivedKeyName name);
+    void setDerivedKeyName(@Nullable final DerivedKeyName name);
 
     /**
      * Get the MasterKeyName child element.
      * 
      * @return the element
      */
-    @Nullable public MasterKeyName getMasterKeyName();
+    @Nullable MasterKeyName getMasterKeyName();
     
     /**
      * Set the MasterKeyName child element.
      * 
      * @param name the key name
      */
-    public void setMasterKeyName(@Nullable final MasterKeyName name);
+    void setMasterKeyName(@Nullable final MasterKeyName name);
 
     /**
      * Gets the Recipient attribute.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKeyName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKeyName.java
index c7cbcd973..c3a49daed 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKeyName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/DerivedKeyName.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DerivedKeyName extends XSString {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DerivedKeyName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DerivedKeyName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedData.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedData.java
index 776ffb3eb..882853359 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedData.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedData.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptedData extends EncryptedType {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptedData";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptedData";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptedDataType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptedDataType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedKey.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedKey.java
index 7c31a1501..070b05c53 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedKey.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedKey.java
@@ -31,62 +31,62 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptedKey extends EncryptedType {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptedKey";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptedKey";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptedKeyType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptedKeyType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** Recipient attribute name. */
-    @Nonnull @NotEmpty public static final String RECIPIENT_ATTRIB_NAME = "Recipient";
+    @Nonnull @NotEmpty static final String RECIPIENT_ATTRIB_NAME = "Recipient";
 
     /**
      * Gets the hint about for whom this encrypted key is intended.
      * 
      * @return the hint about who this encrypted key is intended for
      */
-    @Nullable public String getRecipient();
+    @Nullable String getRecipient();
 
     /**
      * Sets the hint about for whom this encrypted key is intended.
      * 
      * @param newRecipient the hint about who this encrypted key is intended for
      */
-    public void setRecipient(@Nullable final String newRecipient);
+    void setRecipient(@Nullable final String newRecipient);
 
     /**
      * Gets the child element containing pointers to EncryptedData and EncryptedKey elements encrypted using this key.
      * 
      * @return the element containing a list of pointers to encrypted elements
      */
-    @Nullable public ReferenceList getReferenceList();
+    @Nullable ReferenceList getReferenceList();
 
     /**
      * Sets the child element containing pointers to EncryptedData and EncryptedKey elements encrypted using this key.
      * 
      * @param newReferenceList the new reference list for this encrypted key
      */
-    public void setReferenceList(@Nullable final ReferenceList newReferenceList);
+    void setReferenceList(@Nullable final ReferenceList newReferenceList);
 
     /**
      * Gets the child element carrying the human readable name for this key.
      * 
      * @return the human readable name for this key
      */
-    @Nullable public CarriedKeyName getCarriedKeyName();
+    @Nullable CarriedKeyName getCarriedKeyName();
 
     /**
      * Sets the child element carrying the human readable name for this key.
      * 
      * @param newCarriedKeyName the human readable name for this key
      */
-    public void setCarriedKeyName(@Nullable final CarriedKeyName newCarriedKeyName);
+    void setCarriedKeyName(@Nullable final CarriedKeyName newCarriedKeyName);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedType.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedType.java
index c1bc2cf52..6d410939f 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedType.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptedType.java
@@ -34,134 +34,134 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptedType extends XMLObject {
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptedType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptedType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /** Type attribute name. */
-    @Nonnull @NotEmpty public static final String TYPE_ATTRIB_NAME = "Type";
+    @Nonnull @NotEmpty static final String TYPE_ATTRIB_NAME = "Type";
 
     /** MimeType attribute name. */
-    @Nonnull @NotEmpty public static final String MIMETYPE_ATTRIB_NAME = "MimeType";
+    @Nonnull @NotEmpty static final String MIMETYPE_ATTRIB_NAME = "MimeType";
 
     /** Encoding attribute name. */
-    @Nonnull @NotEmpty public static final String ENCODING_ATTRIB_NAME = "Encoding";
+    @Nonnull @NotEmpty static final String ENCODING_ATTRIB_NAME = "Encoding";
 
     /**
      * Gets the unique ID for the XML element.
      * 
      * @return the unique ID for the XML element
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Sets the unique ID for the XML element.
      * 
      * @param newID the unique ID for the XML element
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
 
     /**
      * Gets the type information for the plaintext content.
      * 
      * @return the type information for the plaintext content
      */
-    @Nullable public String getType();
+    @Nullable String getType();
 
     /**
      * Sets the type information for the plaintext content.
      * 
      * @param newType the type information for the plaintext content
      */
-    public void setType(@Nullable final String newType);
+    void setType(@Nullable final String newType);
 
     /**
      * Gets the MIME type of the plaintext content.
      * 
      * @return the MIME type of the plaintext content
      */
-    @Nullable public String getMimeType();
+    @Nullable String getMimeType();
 
     /**
      * Sets the MIME type of the plaintext content.
      * 
      * @param newMimeType the MIME type of the plaintext content
      */
-    public void setMimeType(@Nullable final String newMimeType);
+    void setMimeType(@Nullable final String newMimeType);
 
     /**
      * Gets the encoding applied to the plaintext content prior to encryption.
      * 
      * @return the encoding applied to the plaintext content prior to encryption
      */
-    @Nullable public String getEncoding();
+    @Nullable String getEncoding();
 
     /**
      * Sets the encoding applied to the plaintext content prior to encryption.
      * 
      * @param newEncoding the encoding applied to the plaintext content prior to encryption
      */
-    public void setEncoding(@Nullable final String newEncoding);
+    void setEncoding(@Nullable final String newEncoding);
 
     /**
      * Gets the EncryptionMethod child element.
      * 
      * @return the EncryptionMethod child element
      */
-    @Nullable public EncryptionMethod getEncryptionMethod();
+    @Nullable EncryptionMethod getEncryptionMethod();
 
     /**
      * Sets the EncryptionMethod child element.
      * 
      * @param newEncryptionMethod the new EncryptionMethod child element
      */
-    public void setEncryptionMethod(@Nullable final EncryptionMethod newEncryptionMethod);
+    void setEncryptionMethod(@Nullable final EncryptionMethod newEncryptionMethod);
 
     /**
      * Gets the KeyInfo child element.
      * 
      * @return the KeyInfo child element
      */
-    @Nullable public KeyInfo getKeyInfo();
+    @Nullable KeyInfo getKeyInfo();
 
     /**
      * Sets the KeyInfo child element.
      * 
      * @param newKeyInfo the new KeyInfo child element
      */
-    public void setKeyInfo(@Nullable final KeyInfo newKeyInfo);
+    void setKeyInfo(@Nullable final KeyInfo newKeyInfo);
 
     /**
      * Gets the CipherData child element.
      * 
      * @return the CipherData child element
      */
-    @Nullable public CipherData getCipherData();
+    @Nullable CipherData getCipherData();
 
     /**
      * Sets the CipherData child element.
      * 
      * @param newCipherData the new CipherData child element
      */
-    public void setCipherData(@Nullable final CipherData newCipherData);
+    void setCipherData(@Nullable final CipherData newCipherData);
 
     /**
      * Gets the EncryptionProperties child element.
      * 
      * @return the EncryptionProperties child element
      */
-    @Nullable public EncryptionProperties getEncryptionProperties();
+    @Nullable EncryptionProperties getEncryptionProperties();
 
     /**
      * Sets the EncryptionProperties child element.
      * 
      * @param newEncryptionProperties the new EncryptionProperties child element
      */
-    public void setEncryptionProperties(@Nullable final EncryptionProperties newEncryptionProperties);
+    void setEncryptionProperties(@Nullable final EncryptionProperties newEncryptionProperties);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionMethod.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionMethod.java
index f96fee25a..676349030 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionMethod.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionMethod.java
@@ -32,62 +32,62 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptionMethod extends ElementExtensibleXMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionMethod";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionMethod";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptionMethodType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptionMethodType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
 
     /**
      * Gets the algorithm URI attribute used in this EncryptionMethod.
      * 
      * @return the Algorithm attribute URI attribute string
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
 
     /**
      * Sets the algorithm URI attribute used in this EncryptionMethod.
      * 
      * @param newAlgorithm the new Algorithm URI attribute string
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
 
     /**
      * Gets the KeySize child element.
      * 
      * @return the KeySize child element
      */
-    @Nullable public KeySize getKeySize();
+    @Nullable KeySize getKeySize();
 
     /**
      * Sets the KeySize child element.
      * 
      * @param newKeySize the new KeySize child element
      */
-    public void setKeySize(@Nullable final KeySize newKeySize);
+    void setKeySize(@Nullable final KeySize newKeySize);
 
     /**
      * Gets the OAEPparams child element.
      * 
      * @return the OAEPparams child element
      */
-    @Nullable public OAEPparams getOAEPparams();
+    @Nullable OAEPparams getOAEPparams();
 
     /**
      * Sets the OAEPparams child element.
      * 
      * @param newOAEPparams the new OAEPparams child element
      */
-    public void setOAEPparams(@Nullable final OAEPparams newOAEPparams);
+    void setOAEPparams(@Nullable final OAEPparams newOAEPparams);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperties.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperties.java
index 627a075cf..1fda9fca4 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperties.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperties.java
@@ -26,6 +26,7 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -34,41 +35,41 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptionProperties extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionProperties";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionProperties";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptionPropertiesType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptionPropertiesType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** ID attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /**
      * Get the ID attribute that uniquely identifies this element.
      * 
      * @return ID attribute
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the ID attribute that uniquely identifies this element.
      * 
      * @param newID the new ID attribute value
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
 
     /**
      * Get the list of EncryptionProperty child elements.
      * 
      * @return the List of EncryptionProperty child elements
      */
-    @Nonnull public List<EncryptionProperty> getEncryptionProperties();
+    @Nonnull @Live List<EncryptionProperty> getEncryptionProperties();
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperty.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperty.java
index 3690140c4..9e74d1e54 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperty.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/EncryptionProperty.java
@@ -33,51 +33,51 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface EncryptionProperty extends AttributeExtensibleXMLObject, ElementExtensibleXMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionProperty";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "EncryptionProperty";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "EncryptionPropertyType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "EncryptionPropertyType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** Target attribute name. */
-    @Nonnull @NotEmpty public static final String TARGET_ATTRIB_NAME = "Target";
+    @Nonnull @NotEmpty static final String TARGET_ATTRIB_NAME = "Target";
 
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /**
      * Get the target URI attribute which specifies to which element this. property applies
      * 
      * @return the target URI attribute
      */
-    @Nullable public String getTarget();
+    @Nullable String getTarget();
 
     /**
      * Set the target URI attribute which specifies to which element this property applies.
      * 
      * @param newTarget the new target URI attribute
      */
-    public void setTarget(@Nullable final String newTarget);
+    void setTarget(@Nullable final String newTarget);
 
     /**
      * Get the ID attribute which uniquely identifies this element.
      * 
      * @return the ID attribute value
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the ID attribute which uniquely identifies this element.
      * 
      * @param newID the new ID attribute
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Generator.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Generator.java
index 467e305c6..bb5a1b7d3 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Generator.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Generator.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Generator extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Generator";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Generator";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/IterationCount.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/IterationCount.java
index 0165faa82..4f49c0a74 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/IterationCount.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/IterationCount.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface IterationCount extends XSInteger {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IterationCount";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "IterationCount";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KANonce.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KANonce.java
index ea96c1eeb..32b56103f 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KANonce.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KANonce.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KANonce extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KA-Nonce";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KA-Nonce";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyDerivationMethod.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyDerivationMethod.java
index 065a13044..6dcd47eab 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyDerivationMethod.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyDerivationMethod.java
@@ -33,21 +33,21 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyDerivationMethod extends XMLObject, ElementExtensibleXMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyDerivationMethod";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyDerivationMethod";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "KeyDerivationMethodType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "KeyDerivationMethodType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIBUTE_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIBUTE_NAME = "Algorithm";
 
     /**
      * Gets the algorithm URI attribute.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyLength.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyLength.java
index 11213f9fd..08c6e1b85 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyLength.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyLength.java
@@ -35,10 +35,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyLength extends XSInteger {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyLength";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyLength";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyReference.java
index 6aa340e48..2c76eede9 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeyReference.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyReference extends ReferenceType {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyReference";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyReference";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeySize.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeySize.java
index bee4c9153..dd9b6dc24 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeySize.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/KeySize.java
@@ -31,17 +31,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeySize extends XSInteger {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeySize";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeySize";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "KeySizeType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "KeySizeType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MGF.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MGF.java
index 5f20a3bf1..9ae9afacf 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MGF.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MGF.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface MGF extends AlgorithmIdentifierType {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "MGF";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "MGF";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "MGFType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "MGFType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MasterKeyName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MasterKeyName.java
index ad0c46312..96ee6248a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MasterKeyName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MasterKeyName.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface MasterKeyName extends XSString {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "MasterKeyName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "MasterKeyName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OAEPparams.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OAEPparams.java
index e330ca829..bbffe6c15 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OAEPparams.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OAEPparams.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface OAEPparams extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "OAEPparams";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "OAEPparams";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java
index 0ebc369d2..38aecc7d7 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface OriginatorKeyInfo extends KeyInfo {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "OriginatorKeyInfo";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "OriginatorKeyInfo";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OtherSource.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OtherSource.java
index 00fde3ff7..e81e20e6a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OtherSource.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OtherSource.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface OtherSource extends AlgorithmIdentifierType {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "OtherSource";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "OtherSource";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/P.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/P.java
index 340336165..3f5b858ab 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/P.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/P.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface P extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "P";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "P";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PBKDF2Params.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PBKDF2Params.java
index 7cf7c36f9..9ea435132 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PBKDF2Params.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PBKDF2Params.java
@@ -32,17 +32,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PBKDF2Params extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PBKDF2-params";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PBKDF2-params";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "PBKDF2ParameterType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "PBKDF2ParameterType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
     /**
@@ -50,55 +50,55 @@ public interface PBKDF2Params extends XMLObject {
      * 
      * @return the element
      */
-    @Nullable public Salt getSalt();
+    @Nullable Salt getSalt();
     
     /**
      * Set the Salt child element.
      * 
      * @param salt the salt
      */
-    public void setSalt(@Nullable final Salt salt);
+    void setSalt(@Nullable final Salt salt);
     
     /**
      * Get the IterationCount child element.
      * 
      * @return the element
      */
-    @Nullable public IterationCount getIterationCount();
+    @Nullable IterationCount getIterationCount();
     
     /**
      * Set the IterationCount child element.
      * 
      * @param count the new iteration count
      */
-    public void setIterationCount(@Nullable final IterationCount count);
+    void setIterationCount(@Nullable final IterationCount count);
     
     /**
      * Get the KeyLength child element.
      * 
      * @return the element
      */
-    @Nullable public KeyLength getKeyLength();
+    @Nullable KeyLength getKeyLength();
     
     /**
      * Set the KeyLength child element.
      * 
      * @param length the new key length
      */
-    public void setKeyLength(@Nullable final KeyLength length);
+    void setKeyLength(@Nullable final KeyLength length);
     
     /**
      * Get the PRF child element.
      * 
      * @return the element
      */
-    @Nullable public PRF getPRF();
+    @Nullable PRF getPRF();
     
     /**
      * Set the PRF child element.
      * 
      * @param prf the new PRF element
      */
-    public void setPRF(@Nullable final PRF prf);
+    void setPRF(@Nullable final PRF prf);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PRF.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PRF.java
index 479859444..26c5327da 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PRF.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PRF.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PRF extends AlgorithmIdentifierType {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PRF";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PRF";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "PRFAlgorithmIdentifierType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "PRFAlgorithmIdentifierType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC11_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Parameters.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Parameters.java
index 9c5ff8502..8c1776b0a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Parameters.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Parameters.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Parameters extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Parameters";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Parameters";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PgenCounter.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PgenCounter.java
index 160d2f64f..37a0eee24 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PgenCounter.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/PgenCounter.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PgenCounter extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "pgenCounter";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "pgenCounter";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Public.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Public.java
index 1cd6c921b..2a0e76510 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Public.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Public.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Public extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Public";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Public";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Q.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Q.java
index 9c8fe9058..04a67433a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Q.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Q.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Q extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Q";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Q";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java
index 11945a04d..df9ce0f9e 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface RecipientKeyInfo extends KeyInfo {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RecipientKeyInfo";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "RecipientKeyInfo";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceList.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceList.java
index 01e22675a..1dd15545c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceList.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceList.java
@@ -25,6 +25,7 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -33,10 +34,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface ReferenceList extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ReferenceList";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "ReferenceList";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /**
@@ -44,20 +45,20 @@ public interface ReferenceList extends XMLObject {
      * 
      * @return the list of reference child elements
      */
-    @Nonnull public List<ReferenceType> getReferences();
+    @Nonnull @Live List<ReferenceType> getReferences();
 
     /**
      * Get the list of data reference child elements.
      * 
      * @return the list of data reference child elements
      */
-    @Nonnull public List<DataReference> getDataReferences();
+    @Nonnull @Live List<DataReference> getDataReferences();
 
     /**
      * Get the list of key reference child elements.
      * 
      * @return the list of key reference child elements
      */
-    @Nonnull public List<KeyReference> getKeyReferences();
+    @Nonnull @Live List<KeyReference> getKeyReferences();
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceType.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceType.java
index b2d1b3772..0e386d40c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceType.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/ReferenceType.java
@@ -33,27 +33,27 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface ReferenceType extends ElementExtensibleXMLObject {
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "ReferenceType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "ReferenceType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /** URI attribute name. */
-    @Nonnull @NotEmpty public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull @NotEmpty static final String URI_ATTRIB_NAME = "URI";
 
     /**
      * Get the URI attribute which indicates the referent of this reference.
      * 
      * @return the URI referent attribute value
      */
-    @Nullable public String getURI();
+    @Nullable String getURI();
 
     /**
      * Set the URI attribute which indicates the referent of this reference.
      * 
      * @param newURI the new URI attribute value
      */
-    public void setURI(@Nullable final String newURI);
+    void setURI(@Nullable final String newURI);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Salt.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Salt.java
index d4d771a86..338a2d3bf 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Salt.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Salt.java
@@ -32,10 +32,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Salt extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Salt";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Salt";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
     
     /**
@@ -43,27 +43,27 @@ public interface Salt extends XMLObject {
      * 
      * @return the element
      */
-    @Nullable public Specified getSpecified();
+    @Nullable Specified getSpecified();
     
     /**
      * Set the Specified child element.
      * 
      * @param specified the element
      */
-    public void setSpecified(@Nullable final Specified specified);
+    void setSpecified(@Nullable final Specified specified);
     
     /**
      * Get the OtherSource child element.
      * 
      * @return the element
      */
-    @Nullable public OtherSource getOtherSource();
+    @Nullable OtherSource getOtherSource();
     
     /**
      * Set the OtherSource child element.
      * 
      * @param source value
      */
-    public void setOtherSource(@Nullable final OtherSource source);
+    void setOtherSource(@Nullable final OtherSource source);
     
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Seed.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Seed.java
index 851fdebfb..180e03754 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Seed.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Seed.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Seed extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "seed";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "seed";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Specified.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Specified.java
index ff290b4f6..4dbf402ca 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Specified.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Specified.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Specified extends XSBase64Binary {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Specified";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Specified";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(EncryptionConstants.XMLENC11_NS, DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC11_PREFIX);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Transforms.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Transforms.java
index 35cac699e..6eea0b385 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Transforms.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Transforms.java
@@ -26,6 +26,7 @@ import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 import org.opensaml.xmlsec.signature.Transform;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -34,17 +35,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Transforms extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transforms";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transforms";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(EncryptionConstants.XMLENC_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, EncryptionConstants.XMLENC_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "TransformsType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "TransformsType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(EncryptionConstants.XMLENC_NS, TYPE_LOCAL_NAME,
             EncryptionConstants.XMLENC_PREFIX);
 
     /**
@@ -52,6 +53,6 @@ public interface Transforms extends XMLObject {
      * 
      * @return a List of Transform child elements
      */
-    @Nonnull public List<Transform> getTransforms();
+    @Nonnull @Live List<Transform> getTransforms();
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/XMLEncryptionBuilder.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/XMLEncryptionBuilder.java
index 2d7a7ffc8..7dee15511 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/XMLEncryptionBuilder.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/XMLEncryptionBuilder.java
@@ -34,6 +34,6 @@ public interface XMLEncryptionBuilder<XMLEncryptionType extends XMLObject> exten
      * 
      * @return built XMLObject
      */
-    @Nonnull public XMLEncryptionType buildObject();
+    @Nonnull XMLEncryptionType buildObject();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/CryptoBinary.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/CryptoBinary.java
index 826ab4b6d..de93502b8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/CryptoBinary.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/CryptoBinary.java
@@ -35,10 +35,10 @@ import net.shibboleth.shared.codec.EncodingException;
 public interface CryptoBinary extends XSBase64Binary {
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "CryptoBinary";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "CryptoBinary";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -46,7 +46,7 @@ public interface CryptoBinary extends XSBase64Binary {
      * 
      * @return the BigInteger representation of the element's content
      */
-    @Nullable public BigInteger getValueBigInt();
+    @Nullable BigInteger getValueBigInt();
 
     /**
      * Convenience method to set the value of the element as a BigInteger type.
@@ -54,6 +54,6 @@ public interface CryptoBinary extends XSBase64Binary {
      * @param bigInt the new BigInteger representation of the element's content
      * @throws EncodingException if the byte value of the BigInteger can not be base64 encoded.
      */
-    public void setValueBigInt(@Nullable final BigInteger bigInt) throws EncodingException;
+    void setValueBigInt(@Nullable final BigInteger bigInt) throws EncodingException;
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DEREncodedKeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DEREncodedKeyValue.java
index b362a9738..624416034 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DEREncodedKeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DEREncodedKeyValue.java
@@ -30,34 +30,34 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DEREncodedKeyValue extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DEREncodedKeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DEREncodedKeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG11_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG11_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "DEREncodedKeyValueType"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "DEREncodedKeyValueType"; 
         
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /**
      * Get the Id attribute value.
      * 
      * @return the Id attribute value
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the Id attribute value.
      * 
      * @param newID the new Id attribute value
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DSAKeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DSAKeyValue.java
index 867846b08..ce32d270c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DSAKeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DSAKeyValue.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DSAKeyValue extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DSAKeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DSAKeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "DSAKeyValueType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "DSAKeyValueType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -48,97 +48,97 @@ public interface DSAKeyValue extends XMLObject {
      * 
      * @return the P child element
      */
-    @Nullable public P getP();
+    @Nullable P getP();
 
     /**
      * Set the P child element.
      * 
      * @param newP the new P child element
      */
-    public void setP(@Nullable final P newP);
+    void setP(@Nullable final P newP);
 
     /**
      * Get the Q child element.
      * 
      * @return the Q child element
      */
-    @Nullable public Q getQ();
+    @Nullable Q getQ();
 
     /**
      * Set the Q child element.
      * 
      * @param newQ the new Q child element
      */
-    public void setQ(@Nullable final Q newQ);
+    void setQ(@Nullable final Q newQ);
 
     /**
      * Get the G child element.
      * 
      * @return the G child element
      */
-    @Nullable public G getG();
+    @Nullable G getG();
 
     /**
      * Set the G child element.
      * 
      * @param newG the new G child element
      */
-    public void setG(@Nullable final G newG);
+    void setG(@Nullable final G newG);
 
     /**
      * Get the Y child element.
      * 
      * @return the Y child element
      */
-    @Nullable public Y getY();
+    @Nullable Y getY();
 
     /**
      * Set the Y child element.
      * 
      * @param newY the new Y child element
      */
-    public void setY(@Nullable final Y newY);
+    void setY(@Nullable final Y newY);
 
     /**
      * Get the J child element.
      * 
      * @return the J child element
      */
-    @Nullable public J getJ();
+    @Nullable J getJ();
 
     /**
      * Set the J child element.
      * 
      * @param newJ the new J child element
      */
-    public void setJ(@Nullable final J newJ);
+    void setJ(@Nullable final J newJ);
 
     /**
      * Get the Seed element.
      * 
      * @return the Seed element
      */
-    @Nullable public Seed getSeed();
+    @Nullable Seed getSeed();
 
     /**
      * Set the Seed element.
      * 
      * @param newSeed new Seed element
      */
-    public void setSeed(@Nullable final Seed newSeed);
+    void setSeed(@Nullable final Seed newSeed);
 
     /**
      * Get the PgenCounter element.
      * 
      * @return the PgenCounter element
      */
-    @Nullable public PgenCounter getPgenCounter();
+    @Nullable PgenCounter getPgenCounter();
 
     /**
      * Set the PgenCounter element.
      * 
      * @param newPgenCounter new PgenCounter element
      */
-    public void setPgenCounter(@Nullable final PgenCounter newPgenCounter);
+    void setPgenCounter(@Nullable final PgenCounter newPgenCounter);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DigestMethod.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DigestMethod.java
index cd0f077b2..6df01ffa6 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DigestMethod.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/DigestMethod.java
@@ -33,28 +33,28 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface DigestMethod extends XMLObject, ElementExtensibleXMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "DigestMethod";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "DigestMethod";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "DigestMethodType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "DigestMethodType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
 
     /**
      * Get the Algorithm URI attribute value.
      * 
      * @return the Algorithm URI attribute value
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
 
     /**
      * 
@@ -62,6 +62,6 @@ public interface DigestMethod extends XMLObject, ElementExtensibleXMLObject {
      * 
      * @param newAlgorithm the new Algorithm URI attribute value
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECKeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECKeyValue.java
index 8cb27f088..eb407c8cf 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECKeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECKeyValue.java
@@ -31,76 +31,76 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface ECKeyValue extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ECKeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "ECKeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "ECKeyValueType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "ECKeyValueType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
 
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /**
      * Get the Id attribute value.
      * 
      * @return the Id attribute value
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the Id attribute value.
      * 
      * @param newID the new Id attribute value
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
     
     /**
      * Get the ECParameters child element.
      * 
      * @return the ECParameters child element
      */
-    @Nullable public XMLObject getECParameters();
+    @Nullable XMLObject getECParameters();
 
     /**
      * Set the ECParameters child element.
      * 
      * @param newParams the new ECParameters child element
      */
-    public void setECParameters(@Nullable final XMLObject newParams);
+    void setECParameters(@Nullable final XMLObject newParams);
 
     /**
      * Get the NamedCurve child element.
      * 
      * @return the NamedCurve child element
      */
-    @Nullable public NamedCurve getNamedCurve();
+    @Nullable NamedCurve getNamedCurve();
 
     /**
      * Set the NamedCurve child element.
      * 
      * @param newCurve the new NamedCurve child element
      */
-    public void setNamedCurve(@Nullable final NamedCurve newCurve);
+    void setNamedCurve(@Nullable final NamedCurve newCurve);
 
     /**
      * Get the PublicKey child element.
      * 
      * @return the PublicKey child element
      */
-    @Nullable public PublicKey getPublicKey();
+    @Nullable PublicKey getPublicKey();
 
     /**
      * Set the PublicKey child element.
      * 
      * @param newKey the new PublicKey child element
      */
-    public void setPublicKey(@Nullable final PublicKey newKey);
+    void setPublicKey(@Nullable final PublicKey newKey);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECPointType.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECPointType.java
index c5fb91bac..c40df115c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECPointType.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/ECPointType.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface ECPointType extends CryptoBinary {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "ECPointType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "ECPointType";
     
     /** Default element name. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Exponent.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Exponent.java
index 33065a1da..25100d9cc 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Exponent.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Exponent.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Exponent extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Exponent";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Exponent";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/G.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/G.java
index 491e51df5..7f97f576e 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/G.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/G.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface G extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "G";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "G";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/J.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/J.java
index b3c0878c3..bdd8ec14a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/J.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/J.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface J extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "J";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "J";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java
index 92381fa91..8a6019f1f 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java
@@ -28,48 +28,49 @@ import org.opensaml.xmlsec.encryption.AgreementMethod;
 import org.opensaml.xmlsec.encryption.EncryptedKey;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /** XMLObject representing XML Digital Signature, version 20020212, KeyInfo element. */
 public interface KeyInfo extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyInfo";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyInfo";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "KeyInfoType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "KeyInfoType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /**
      * Get the Id attribute value.
      * 
      * @return the Id attribute value
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the Id attribute value.
      * 
      * @param newID the new Id attribute value
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
 
     /**
      * Get the list of all XMLObject children.
      * 
      * @return the list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects();
+    @Nonnull @Live List<XMLObject> getXMLObjects();
 
     /**
      * Get the list of XMLObject children whose type or element QName matches the specified QName.
@@ -78,70 +79,70 @@ public interface KeyInfo extends XMLObject {
      * 
      * @return the matching list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
+    @Nonnull @Live List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
 
     /**
      * Get the list of KeyName child elements.
      * 
      * @return the list of KeyName child elements
      */
-    @Nonnull public List<KeyName> getKeyNames();
+    @Nonnull @Live List<KeyName> getKeyNames();
 
     /**
      * Get the list of KeyValue child elements.
      * 
      * @return the list of KeyValue child elements
      */
-    @Nonnull public List<KeyValue> getKeyValues();
+    @Nonnull @Live List<KeyValue> getKeyValues();
 
     /**
      * Get the list of DEREncodedKeyValue child elements.
      * 
      * @return the list of DEREncodedKeyValue child elements
      */
-    @Nonnull public List<DEREncodedKeyValue> getDEREncodedKeyValues();
+    @Nonnull @Live List<DEREncodedKeyValue> getDEREncodedKeyValues();
     
     /**
      * Get the list of RetrievalMethod child elements.
      * 
      * @return the list of RetrievalMethod child elements
      */
-    @Nonnull public List<RetrievalMethod> getRetrievalMethods();
+    @Nonnull @Live List<RetrievalMethod> getRetrievalMethods();
 
     /**
      * Get the list of KeyInfoReference child elements.
      * 
      * @return the list of KeyInfoReference child elements
      */
-    @Nonnull public List<KeyInfoReference> getKeyInfoReferences();
+    @Nonnull @Live List<KeyInfoReference> getKeyInfoReferences();
     
     /**
      * Get the list of X509Data child elements.
      * 
      * @return the list of X509Data child elements
      */
-    @Nonnull public List<X509Data> getX509Datas();
+    @Nonnull @Live List<X509Data> getX509Datas();
 
     /**
      * Get the list of PGPData child elements.
      * 
      * @return the list of PGPData child elements
      */
-    @Nonnull public List<PGPData> getPGPDatas();
+    @Nonnull @Live List<PGPData> getPGPDatas();
 
     /**
      * Get the list of SPKIData child elements.
      * 
      * @return the list of SPKIData child elements
      */
-    @Nonnull public List<SPKIData> getSPKIDatas();
+    @Nonnull @Live List<SPKIData> getSPKIDatas();
 
     /**
      * Get the list of MgmtData child elements.
      * 
      * @return the list of MgmtData child elements
      */
-    @Nonnull public List<MgmtData> getMgmtDatas();
+    @Nonnull @Live List<MgmtData> getMgmtDatas();
 
     /**
      * Get the list of AgreementMethod child elements.
@@ -151,7 +152,7 @@ public interface KeyInfo extends XMLObject {
      * 
      * @return the list of AgreementMethod child elements
      */
-    @Nonnull public List<AgreementMethod> getAgreementMethods();
+    @Nonnull @Live List<AgreementMethod> getAgreementMethods();
 
     /**
      * Get the list of EncryptedKey child elements
@@ -161,6 +162,6 @@ public interface KeyInfo extends XMLObject {
      * 
      * @return the list of EncryptedKey child elements
      */
-    @Nonnull public List<EncryptedKey> getEncryptedKeys();
+    @Nonnull @Live List<EncryptedKey> getEncryptedKeys();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoReference.java
index c3659762e..f24ce8f49 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoReference.java
@@ -33,51 +33,51 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyInfoReference extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyInfoReference";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyInfoReference";
     
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "KeyInfoReferenceType"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "KeyInfoReferenceType"; 
         
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Id attribute name. */
-    @Nonnull @NotEmpty public static final String ID_ATTRIB_NAME = "Id";
+    @Nonnull @NotEmpty static final String ID_ATTRIB_NAME = "Id";
 
     /** URI attribute name. */
-    @Nonnull @NotEmpty public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull @NotEmpty static final String URI_ATTRIB_NAME = "URI";
         
     /**
      * Get the Id attribute value.
      * 
      * @return the Id attribute value
      */
-    @Nullable public String getID();
+    @Nullable String getID();
 
     /**
      * Set the Id attribute value.
      * 
      * @param newID the new Id attribute value
      */
-    public void setID(@Nullable final String newID);
+    void setID(@Nullable final String newID);
     
     /**
      * Get the URI attribute value.
      * 
      * @return the URI attribute value
      */
-    @Nullable public String getURI();
+    @Nullable String getURI();
     
     /**
      * Set the URI attribute value.
      * 
      * @param newURI the new URI attribute value
      */
-    public void setURI(@Nullable final String newURI);
+    void setURI(@Nullable final String newURI);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyName.java
index 08adb091b..9634a5f5a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyName.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyName extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyValue.java
index a68c25f6a..948a01e13 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyValue.java
@@ -33,17 +33,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface KeyValue extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "KeyValueType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "KeyValueType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -51,74 +51,69 @@ public interface KeyValue extends XMLObject {
      * 
      * @return DSAKeyValue child element
      */
-    @Nullable public DSAKeyValue getDSAKeyValue();
+    @Nullable DSAKeyValue getDSAKeyValue();
 
     /**
      * Set the DSAKeyValue child element.
      * 
      * @param newDSAKeyValue the new DSAKeyValue child element
      */
-    public void setDSAKeyValue(@Nullable final DSAKeyValue newDSAKeyValue);
+    void setDSAKeyValue(@Nullable final DSAKeyValue newDSAKeyValue);
 
     /**
      * Get the RSAKeyValue child element.
      * 
      * @return the RSAKeyValue child element
      */
-    @Nullable public RSAKeyValue getRSAKeyValue();
+    @Nullable RSAKeyValue getRSAKeyValue();
 
     /**
      * Set the RSAKeyValue child element.
      * 
      * @param newRSAKeyValue the new RSAKeyValue child element
      */
-    public void setRSAKeyValue(@Nullable final RSAKeyValue newRSAKeyValue);
+    void setRSAKeyValue(@Nullable final RSAKeyValue newRSAKeyValue);
 
     /**
      * Get the ECKeyValue child element.
      * 
      * @return the ECKeyValue child element
      */
-    @Nullable public ECKeyValue getECKeyValue();
+    @Nullable ECKeyValue getECKeyValue();
 
     /**
      * Set the ECKeyValue child element.
      * 
      * @param newECKeyValue the new ECKeyValue child element
      */
-    public void setECKeyValue(@Nullable final ECKeyValue newECKeyValue);
+    void setECKeyValue(@Nullable final ECKeyValue newECKeyValue);
     
     /**
      * Get the DHKeyValue child element.
      * 
      * @return DHKeyValue child element
      */
-    @Nullable public default DHKeyValue getDHKeyValue() {
-        //TODO remove 'default' and method body in next major version (v5)
-        throw new UnsupportedOperationException("Method not implemented");
-    }
+    @Nullable DHKeyValue getDHKeyValue();
 
     /**
      * Set the DHKeyValue child element.
      * 
      * @param newDHKeyValue the new DHKeyValue child element
      */
-    public default void setDHKeyValue(@Nullable final DHKeyValue newDHKeyValue) {
-        //TODO remove 'default' and method body in next major version (v5)
-        throw new UnsupportedOperationException("Method not implemented");
-    }
+    void setDHKeyValue(@Nullable final DHKeyValue newDHKeyValue);
 
     /**
      * Get the wildcard <any> XMLObject child element.
      * 
      * @return the wildcard XMLObject child element
      */
-    @Nullable public XMLObject getUnknownXMLObject();
+    @Nullable XMLObject getUnknownXMLObject();
 
     /**
      * Set the wildcard <any> XMLObject child element.
      * 
      * @param newXMLObject the wildcard XMLObject child element
      */
-    public void setUnknownXMLObject(@Nullable final XMLObject newXMLObject);
-}
+    void setUnknownXMLObject(@Nullable final XMLObject newXMLObject);
+
+}
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/MgmtData.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/MgmtData.java
index 37ac740f8..2ce9f097e 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/MgmtData.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/MgmtData.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface MgmtData extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "MgmtData";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "MgmtData";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Modulus.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Modulus.java
index 0aee9f173..94e9e445c 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Modulus.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Modulus.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Modulus extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Modulus";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Modulus";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/NamedCurve.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/NamedCurve.java
index c332b0365..379309da1 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/NamedCurve.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/NamedCurve.java
@@ -33,34 +33,34 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface NamedCurve extends XMLObject {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "NamedCurve";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "NamedCurve";
     
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "NamedCurveType"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "NamedCurveType"; 
         
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** URI attribute name. */
-    @Nonnull @NotEmpty public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull @NotEmpty static final String URI_ATTRIB_NAME = "URI";
     
     /**
      * Get the URI attribute value.
      * 
      * @return the URI attribute value
      */
-    @Nullable public String getURI();
+    @Nullable String getURI();
     
     /**
      * Set the URI attribute value.
      * 
      * @param newURI the new URI attribute value
      */
-    public void setURI(@Nullable final String newURI);
+    void setURI(@Nullable final String newURI);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/P.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/P.java
index ede03a48f..0977c83ec 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/P.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/P.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface P extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "P";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "P";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPData.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPData.java
index 27c82d9c8..57ff19990 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPData.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPData.java
@@ -33,17 +33,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PGPData extends XMLObject, ElementExtensibleXMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPData";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPData";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "PGPDataType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "PGPDataType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -51,27 +51,27 @@ public interface PGPData extends XMLObject, ElementExtensibleXMLObject {
      * 
      * @return the PGPKeyID child element
      */
-    @Nullable public PGPKeyID getPGPKeyID();
+    @Nullable PGPKeyID getPGPKeyID();
 
     /**
      * Set PGPKeyID child element.
      * 
      * @param newPGPKeyID the new PGPKeyID
      */
-    public void setPGPKeyID(@Nullable final PGPKeyID newPGPKeyID);
+    void setPGPKeyID(@Nullable final PGPKeyID newPGPKeyID);
 
     /**
      * Get PGPKeyPacket child element.
      * 
      * @return the PGPKeyPacket child element
      */
-    @Nullable public PGPKeyPacket getPGPKeyPacket();
+    @Nullable PGPKeyPacket getPGPKeyPacket();
 
     /**
      * Set PGPKeyPacket child element.
      * 
      * @param newPGPKeyPacket the new PGPKeyPacket
      */
-    public void setPGPKeyPacket(@Nullable final PGPKeyPacket newPGPKeyPacket);
+    void setPGPKeyPacket(@Nullable final PGPKeyPacket newPGPKeyPacket);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyID.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyID.java
index 59fcd0189..6107975ef 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyID.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyID.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PGPKeyID extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPKeyID";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPKeyID";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyPacket.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyPacket.java
index 493708b4a..bf20eecf6 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyPacket.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PGPKeyPacket.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PGPKeyPacket extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPKeyPacket";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PGPKeyPacket";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PgenCounter.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PgenCounter.java
index adc450831..b974944d6 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PgenCounter.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PgenCounter.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PgenCounter extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PgenCounter";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PgenCounter";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PublicKey.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PublicKey.java
index c7ccd4d60..8c43fdcdb 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PublicKey.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/PublicKey.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface PublicKey extends ECPointType {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "PublicKey";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "PublicKey";
     
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Q.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Q.java
index 1834ee246..fd17cbc21 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Q.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Q.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Q extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Q";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Q";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RSAKeyValue.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RSAKeyValue.java
index 995fb3996..3eeebeaf3 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RSAKeyValue.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RSAKeyValue.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface RSAKeyValue extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RSAKeyValue";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "RSAKeyValue";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "RSAKeyValueType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "RSAKeyValueType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -48,27 +48,27 @@ public interface RSAKeyValue extends XMLObject {
      * 
      * @return the Modulus child element
      */
-    @Nullable public Modulus getModulus();
+    @Nullable Modulus getModulus();
 
     /**
      * Set the Modulus child element.
      * 
      * @param newModulus the new Modulus child element
      */
-    public void setModulus(@Nullable final Modulus newModulus);
+    void setModulus(@Nullable final Modulus newModulus);
 
     /**
      * Get the Exponent child element.
      * 
      * @return the Exponent child element
      */
-    @Nullable public Exponent getExponent();
+    @Nullable Exponent getExponent();
 
     /**
      * Set the Exponent child element.
      * 
      * @param newExponent the new Exponent child element
      */
-    public void setExponent(@Nullable final Exponent newExponent);
+    void setExponent(@Nullable final Exponent newExponent);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RetrievalMethod.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RetrievalMethod.java
index b0c21c3b1..e7e317a80 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RetrievalMethod.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/RetrievalMethod.java
@@ -32,65 +32,65 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface RetrievalMethod extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RetrievalMethod";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "RetrievalMethod";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "RetrievalMethodType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "RetrievalMethodType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /** URI attribute name. */
-    @Nonnull @NotEmpty public static final String URI_ATTRIB_NAME = "URI";
+    @Nonnull @NotEmpty static final String URI_ATTRIB_NAME = "URI";
 
     /** Type attribute name. */
-    @Nonnull @NotEmpty public static final String TYPE_ATTRIB_NAME = "Type";
+    @Nonnull @NotEmpty static final String TYPE_ATTRIB_NAME = "Type";
 
     /**
      * Get the URI attribute value.
      * 
      * @return the URI attribute value
      */
-    @Nullable public String getURI();
+    @Nullable String getURI();
 
     /**
      * Set the URI attribute value.
      * 
      * @param newURI the new URI attribute value
      */
-    public void setURI(@Nullable final String newURI);
+    void setURI(@Nullable final String newURI);
 
     /**
      * Set the Type attribute value.
      * 
      * @return the Type attribute value
      */
-    @Nullable public String getType();
+    @Nullable String getType();
 
     /**
      * Set the Type attribute value.
      * 
      * @param newType the new Type attribute value
      */
-    public void setType(@Nullable final String newType);
+    void setType(@Nullable final String newType);
 
     /**
      * Get the Transforms child element.
      * 
      * @return the Transforms child element
      */
-    @Nullable public Transforms getTransforms();
+    @Nullable Transforms getTransforms();
 
     /**
      * Set the Transforms child element.
      * 
      * @param newTransforms the new Transforms child element
      */
-    public void setTransforms(@Nullable final Transforms newTransforms);
+    void setTransforms(@Nullable final Transforms newTransforms);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKIData.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKIData.java
index 09d9ce898..dfa873d08 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKIData.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKIData.java
@@ -25,6 +25,7 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -33,17 +34,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface SPKIData extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SPKIData";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "SPKIData";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "SPKIDataType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "SPKIDataType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -51,7 +52,7 @@ public interface SPKIData extends XMLObject {
      * 
      * @return the list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects();
+    @Nonnull @Live List<XMLObject> getXMLObjects();
 
     /**
      * Get the list of XMLObject children whose type or element QName matches the specified QName.
@@ -60,13 +61,13 @@ public interface SPKIData extends XMLObject {
      * 
      * @return the matching list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
+    @Nonnull @Live List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
 
     /**
      * Get the list of SPKISexp child elements.
      * 
      * @return the list of SPKISexp child elements
      */
-    @Nonnull public List<SPKISexp> getSPKISexps();
+    @Nonnull @Live List<SPKISexp> getSPKISexps();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKISexp.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKISexp.java
index af8cc4ee2..2c175cfb2 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKISexp.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/SPKISexp.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface SPKISexp extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SPKISexp";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "SPKISexp";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Seed.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Seed.java
index 3d6c5716b..a29012191 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Seed.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Seed.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Seed extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Seed";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Seed";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Signature.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Signature.java
index 16e3cc943..71c929780 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Signature.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Signature.java
@@ -28,6 +28,7 @@ import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.signature.support.ContentReference;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -36,17 +37,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Signature extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Signature";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Signature";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "SignatureType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "SignatureType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME, 
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME, 
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -54,28 +55,28 @@ public interface Signature extends XMLObject {
      * 
      * @return the canonicalization algorithm used to create the signature content
      */
-    @Nullable public String getCanonicalizationAlgorithm();
+    @Nullable String getCanonicalizationAlgorithm();
 
     /**
      * Sets the canonicalization algorithm used to create the signature content.
      * 
      * @param newAlgorithm the canonicalization algorithm used to create the signature content
      */
-    public void setCanonicalizationAlgorithm(@Nullable final String newAlgorithm);
+    void setCanonicalizationAlgorithm(@Nullable final String newAlgorithm);
 
     /**
      * Gets the algorithm used to compute the signature.
      * 
      * @return the algorithm used to compute the signature
      */
-    @Nullable public String getSignatureAlgorithm();
+    @Nullable String getSignatureAlgorithm();
 
     /**
      * Sets the algorithm used to compute the signature.
      * 
      * @param newAlgorithm the algorithm used to compute the signature
      */
-    public void setSignatureAlgorithm(@Nullable final String newAlgorithm);
+    void setSignatureAlgorithm(@Nullable final String newAlgorithm);
     
     /**
      * Gets the HMAC output length value, optionally used when signing
@@ -83,7 +84,7 @@ public interface Signature extends XMLObject {
      * 
      * @return the HMACOutputLength value
      */
-    @Nullable public Integer getHMACOutputLength();
+    @Nullable Integer getHMACOutputLength();
     
     /**
      * Sets the HMAC output length value, optionally used when signing
@@ -91,40 +92,40 @@ public interface Signature extends XMLObject {
      * 
      * @param length the new HMACOutputLength value
      */
-    public void setHMACOutputLength(@Nullable final Integer length);
+    void setHMACOutputLength(@Nullable final Integer length);
 
     /**
      * Gets the signature signing credential.
      * 
      * @return the signature signing credential
      */
-    @Nullable public Credential getSigningCredential();
+    @Nullable Credential getSigningCredential();
 
     /**
      * Sets the signature signing credential.
      * 
      * @param newCredential the signature signing credential
      */
-    public void setSigningCredential(@Nullable final Credential newCredential);
+    void setSigningCredential(@Nullable final Credential newCredential);
 
     /**
      * Gets the key info added to this signature.
      * 
      * @return the key info added to this signature
      */
-    @Nullable public KeyInfo getKeyInfo();
+    @Nullable KeyInfo getKeyInfo();
 
     /**
      * Sets the key info added to this signature.
      * 
      * @param newKeyInfo the key info added to this signature
      */
-    public void setKeyInfo(@Nullable final KeyInfo newKeyInfo);
+    void setKeyInfo(@Nullable final KeyInfo newKeyInfo);
 
     /**
      * Gets the list of signature content references.
      * 
      * @return the list of signature content references
      */
-    @Nonnull public List<ContentReference> getContentReferences();
+    @Nonnull @Live List<ContentReference> getContentReferences();
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transform.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transform.java
index 2bfb5aaac..1ec2affc2 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transform.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transform.java
@@ -26,6 +26,7 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -34,28 +35,28 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Transform extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transform";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transform";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "TransformType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "TransformType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
 
     /**
      * Get the Algorithm URI attribute value.
      * 
      * @return the Algorithm URI attribute value
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
 
     /**
      * 
@@ -63,7 +64,7 @@ public interface Transform extends XMLObject {
      * 
      * @param newAlgorithm the new Algorithm URI attribute value
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
 
     /**
      * Get the list of XMLObject children that match a particular QName.
@@ -72,20 +73,20 @@ public interface Transform extends XMLObject {
      * 
      * @return the list of XMLObject children that match the given QName
      */
-    @Nonnull public List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
+    @Nonnull @Live List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
 
     /**
      * Get the list of XPath child elements.
      * 
      * @return list of XPath child elements
      */
-    @Nonnull public List<XPath> getXPaths();
+    @Nonnull @Live List<XPath> getXPaths();
 
     /**
      * Gets the ordered list of all XMLObject child elements of this element.
      * 
      * @return list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getAllChildren();
+    @Nonnull @Live List<XMLObject> getAllChildren();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transforms.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transforms.java
index bd0b869f6..8a95743d4 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transforms.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Transforms.java
@@ -25,6 +25,7 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /**
@@ -33,17 +34,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Transforms extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transforms";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Transforms";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "TransformsType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "TransformsType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -51,6 +52,6 @@ public interface Transforms extends XMLObject {
      * 
      * @return a List of Transform child elements
      */
-    @Nonnull public List<Transform> getTransforms();
+    @Nonnull @Live List<Transform> getTransforms();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509CRL.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509CRL.java
index f9b911213..1fa58f787 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509CRL.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509CRL.java
@@ -29,10 +29,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509CRL extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509CRL";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509CRL";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Certificate.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Certificate.java
index ec11a923b..4eff318bf 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Certificate.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Certificate.java
@@ -29,10 +29,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509Certificate extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Certificate";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Certificate";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Data.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Data.java
index 021c2a0d5..078b611c7 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Data.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Data.java
@@ -25,23 +25,24 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
+import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 /** XMLObject representing XML Digital Signature, version 20020212, X509Data element. */
 public interface X509Data extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Data";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Data";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "X509DataType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "X509DataType";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -49,7 +50,7 @@ public interface X509Data extends XMLObject {
      * 
      * @return the list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects();
+    @Nonnull @Live List<XMLObject> getXMLObjects();
 
     /**
      * Get the list of XMLObject children whose type or element QName matches the specified QName.
@@ -58,47 +59,47 @@ public interface X509Data extends XMLObject {
      * 
      * @return the matching list of XMLObject children
      */
-    @Nonnull public List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
+    @Nonnull @Live List<XMLObject> getXMLObjects(@Nonnull final QName typeOrName);
 
     /**
      * Get the list of X509IssuerSerial child elements.
      * 
      * @return the list of X509IssuerSerial child elements
      */
-    @Nonnull public List<X509IssuerSerial> getX509IssuerSerials();
+    @Nonnull @Live List<X509IssuerSerial> getX509IssuerSerials();
 
     /**
      * Get the list of X509SKI child elements.
      * 
      * @return the list of X509SKI child elements
      */
-    @Nonnull public List<X509SKI> getX509SKIs();
+    @Nonnull @Live List<X509SKI> getX509SKIs();
 
     /**
      * Get the list of X509SubjectName child elements.
      * 
      * @return the list of X509SubjectName child elements
      */
-    @Nonnull public List<X509SubjectName> getX509SubjectNames();
+    @Nonnull @Live List<X509SubjectName> getX509SubjectNames();
 
     /**
      * Get the list of X509Certificate child elements.
      * 
      * @return the list of X509Certificate child elements
      */
-    @Nonnull public List<X509Certificate> getX509Certificates();
+    @Nonnull @Live List<X509Certificate> getX509Certificates();
 
     /**
      * Get the list of X509CRL child elements.
      * 
      * @return the list of X509CRL child elements
      */
-    @Nonnull public List<X509CRL> getX509CRLs();
+    @Nonnull @Live List<X509CRL> getX509CRLs();
 
     /**
      * Get the list of X509Digest child elements.
      * 
      * @return the list of X509Digest child elements
      */
-    @Nonnull public List<X509Digest> getX509Digests();
+    @Nonnull @Live List<X509Digest> getX509Digests();
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Digest.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Digest.java
index 5b57293f4..ac7cf29e6 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Digest.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Digest.java
@@ -33,28 +33,28 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509Digest extends XSBase64Binary {
     
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Digest";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509Digest";
     
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME =
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "X509DigestType"; 
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "X509DigestType"; 
         
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(SignatureConstants.XMLSIG11_NS, TYPE_LOCAL_NAME, SignatureConstants.XMLSIG11_PREFIX);
     
     /** Algorithm attribute name. */
-    @Nonnull @NotEmpty public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
+    @Nonnull @NotEmpty static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
     
     /**
      * Get the Algorithm URI attribute value.
      *  
      * @return the Algorithm URI attribute value
      */
-    @Nullable public String getAlgorithm();
+    @Nullable String getAlgorithm();
     
     /**
      * 
@@ -62,6 +62,6 @@ public interface X509Digest extends XSBase64Binary {
      *  
      * @param newAlgorithm the new Algorithm URI attribute value
      */
-    public void setAlgorithm(@Nullable final String newAlgorithm);
+    void setAlgorithm(@Nullable final String newAlgorithm);
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerName.java
index a297ba21c..f33b5c8a8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerName.java
@@ -29,10 +29,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509IssuerName extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509IssuerName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509IssuerName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerSerial.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerSerial.java
index e6a3c626b..99e1f6239 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerSerial.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509IssuerSerial.java
@@ -30,17 +30,17 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509IssuerSerial extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509IssuerSerial";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509IssuerSerial";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "X509IssuerSerialType";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "X509IssuerSerialType";
 
     /** QName of the XSI type. */
-    @Nonnull @NotEmpty public static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
+    @Nonnull @NotEmpty static final QName TYPE_NAME = new QName(SignatureConstants.XMLSIG_NS, TYPE_LOCAL_NAME,
             SignatureConstants.XMLSIG_PREFIX);
 
     /**
@@ -48,27 +48,27 @@ public interface X509IssuerSerial extends XMLObject {
      * 
      * @return the X509Issuername child element
      */
-    @Nullable public X509IssuerName getX509IssuerName();
+    @Nullable X509IssuerName getX509IssuerName();
 
     /**
      * Set the X509IssuerName child element.
      * 
      * @param newX509IssuerName the new X509IssuerName child element
      */
-    public void setX509IssuerName(@Nullable final X509IssuerName newX509IssuerName);
+    void setX509IssuerName(@Nullable final X509IssuerName newX509IssuerName);
 
     /**
      * Get the X509SerialNumber child element.
      * 
      * @return the X509SerialNumber child element
      */
-    @Nullable public X509SerialNumber getX509SerialNumber();
+    @Nullable X509SerialNumber getX509SerialNumber();
 
     /**
      * Set the X509SerialNumber child element.
      * 
      * @param newX509SerialNumber the new X509SerialNumber child element
      */
-    public void setX509SerialNumber(@Nullable final X509SerialNumber newX509SerialNumber);
+    void setX509SerialNumber(@Nullable final X509SerialNumber newX509SerialNumber);
 
 }
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SKI.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SKI.java
index 9e3795881..5dbf1204a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SKI.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SKI.java
@@ -29,10 +29,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509SKI extends XSBase64Binary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SKI";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SKI";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SerialNumber.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SerialNumber.java
index 9526b0575..693884f83 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SerialNumber.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SerialNumber.java
@@ -35,17 +35,17 @@ import net.shibboleth.shared.xml.XMLConstants;
 public interface X509SerialNumber extends XMLObject {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SerialNumber";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SerialNumber";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
     /** Local name of the XSI type. */
-    @Nonnull @NotEmpty public static final String TYPE_LOCAL_NAME = "integer";
+    @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "integer";
 
     /** QName of the XSI type. */
-    @Nonnull public static final QName TYPE_NAME =
+    @Nonnull static final QName TYPE_NAME =
             new QName(XMLConstants.XSD_NS, TYPE_LOCAL_NAME, XMLConstants.XSD_PREFIX);
 
     /**
@@ -53,13 +53,13 @@ public interface X509SerialNumber extends XMLObject {
      * 
      * @return the integer
      */
-    @Nullable public BigInteger getValue();
+    @Nullable BigInteger getValue();
 
     /**
      * Sets the integer.
      * 
      * @param newValue the integer value
      */
-    public void setValue(@Nullable final BigInteger newValue);
+    void setValue(@Nullable final BigInteger newValue);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SubjectName.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SubjectName.java
index ca37d81d0..910375658 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SubjectName.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509SubjectName.java
@@ -29,10 +29,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface X509SubjectName extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SubjectName";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "X509SubjectName";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XMLSignatureBuilder.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XMLSignatureBuilder.java
index 5c8ab68a1..f0fdc1b96 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XMLSignatureBuilder.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XMLSignatureBuilder.java
@@ -35,6 +35,6 @@ public interface XMLSignatureBuilder<XMLSignatureType extends XMLObject> extends
      * 
      * @return built XMLObject
      */
-    @Nonnull public XMLSignatureType buildObject();
+    @Nonnull XMLSignatureType buildObject();
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XPath.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XPath.java
index 63855495c..da16fedfe 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XPath.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/XPath.java
@@ -31,10 +31,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface XPath extends XSString {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "XPath";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "XPath";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Y.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Y.java
index 593dbf318..8aefef8b6 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Y.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/Y.java
@@ -30,10 +30,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public interface Y extends CryptoBinary {
 
     /** Element local name. */
-    @Nonnull @NotEmpty public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Y";
+    @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "Y";
 
     /** Default element name. */
-    @Nonnull public static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
+    @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG_NS,
             DEFAULT_ELEMENT_LOCAL_NAME, SignatureConstants.XMLSIG_PREFIX);
 
 }
\ No newline at end of file

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