[java-opensaml] 11/12: JPAR-85 - Checkstyle, check final parameters

Tom Zeller tzeller at dragonacea.biz
Thu Aug 10 18:26:00 EDT 2017


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

tzeller pushed a commit to branch master
in repository java-opensaml.

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

commit 5ce1917a137ce2ef531f4c0683ec2d52e3dbfced
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 10 17:11:15 2017 -0500

    JPAR-85 - Checkstyle, check final parameters
---
 .../impl/JavaCryptoValidationInitializer.java      |  4 +--
 .../encryption/impl/AgreementMethodBuilder.java    |  3 +-
 .../encryption/impl/AgreementMethodImpl.java       | 13 +++++----
 .../encryption/impl/AgreementMethodMarshaller.java |  2 +-
 .../impl/AgreementMethodUnmarshaller.java          |  4 +--
 .../impl/AlgorithmIdentifierTypeImpl.java          |  7 +++--
 .../impl/AlgorithmIdentifierTypeMarshaller.java    |  2 +-
 .../impl/AlgorithmIdentifierTypeUnmarshaller.java  |  4 +--
 .../encryption/impl/CarriedKeyNameBuilder.java     |  2 +-
 .../xmlsec/encryption/impl/CarriedKeyNameImpl.java |  3 +-
 .../xmlsec/encryption/impl/CipherDataBuilder.java  |  2 +-
 .../xmlsec/encryption/impl/CipherDataImpl.java     |  6 ++--
 .../encryption/impl/CipherDataUnmarshaller.java    |  2 +-
 .../encryption/impl/CipherReferenceBuilder.java    |  3 +-
 .../encryption/impl/CipherReferenceImpl.java       |  7 +++--
 .../encryption/impl/CipherReferenceMarshaller.java |  2 +-
 .../impl/CipherReferenceUnmarshaller.java          |  4 +--
 .../xmlsec/encryption/impl/CipherValueBuilder.java |  2 +-
 .../xmlsec/encryption/impl/CipherValueImpl.java    |  2 +-
 .../xmlsec/encryption/impl/DHKeyValueBuilder.java  |  2 +-
 .../xmlsec/encryption/impl/DHKeyValueImpl.java     | 14 +++++-----
 .../encryption/impl/DHKeyValueUnmarshaller.java    |  2 +-
 .../encryption/impl/DataReferenceBuilder.java      |  2 +-
 .../xmlsec/encryption/impl/DataReferenceImpl.java  |  3 +-
 .../encryption/impl/EncryptedDataBuilder.java      |  2 +-
 .../xmlsec/encryption/impl/EncryptedDataImpl.java  |  3 +-
 .../encryption/impl/EncryptedKeyBuilder.java       |  2 +-
 .../xmlsec/encryption/impl/EncryptedKeyImpl.java   |  8 +++---
 .../encryption/impl/EncryptedKeyMarshaller.java    |  2 +-
 .../encryption/impl/EncryptedKeyUnmarshaller.java  |  4 +--
 .../xmlsec/encryption/impl/EncryptedTypeImpl.java  | 19 +++++++------
 .../encryption/impl/EncryptedTypeMarshaller.java   |  2 +-
 .../encryption/impl/EncryptedTypeUnmarshaller.java |  4 +--
 .../encryption/impl/EncryptionMethodBuilder.java   |  3 +-
 .../encryption/impl/EncryptionMethodImpl.java      | 11 ++++----
 .../impl/EncryptionMethodMarshaller.java           |  2 +-
 .../impl/EncryptionMethodUnmarshaller.java         |  4 +--
 .../impl/EncryptionPropertiesBuilder.java          |  3 +-
 .../encryption/impl/EncryptionPropertiesImpl.java  |  5 ++--
 .../impl/EncryptionPropertiesMarshaller.java       |  2 +-
 .../impl/EncryptionPropertiesUnmarshaller.java     |  4 +--
 .../encryption/impl/EncryptionPropertyBuilder.java |  3 +-
 .../encryption/impl/EncryptionPropertyImpl.java    |  9 +++---
 .../impl/EncryptionPropertyMarshaller.java         |  2 +-
 .../impl/EncryptionPropertyUnmarshaller.java       |  4 +--
 .../xmlsec/encryption/impl/GeneratorBuilder.java   |  2 +-
 .../xmlsec/encryption/impl/GeneratorImpl.java      |  2 +-
 .../xmlsec/encryption/impl/KANonceBuilder.java     |  2 +-
 .../xmlsec/encryption/impl/KANonceImpl.java        |  2 +-
 .../encryption/impl/KeyReferenceBuilder.java       |  2 +-
 .../xmlsec/encryption/impl/KeyReferenceImpl.java   |  2 +-
 .../xmlsec/encryption/impl/KeySizeBuilder.java     |  2 +-
 .../xmlsec/encryption/impl/KeySizeImpl.java        |  2 +-
 .../xmlsec/encryption/impl/MGFBuilder.java         |  2 +-
 .../opensaml/xmlsec/encryption/impl/MGFImpl.java   |  2 +-
 .../xmlsec/encryption/impl/OAEPparamsBuilder.java  |  2 +-
 .../xmlsec/encryption/impl/OAEPparamsImpl.java     |  2 +-
 .../encryption/impl/OriginatorKeyInfoBuilder.java  |  3 +-
 .../encryption/impl/OriginatorKeyInfoImpl.java     |  3 +-
 .../opensaml/xmlsec/encryption/impl/PBuilder.java  |  2 +-
 .../org/opensaml/xmlsec/encryption/impl/PImpl.java |  2 +-
 .../xmlsec/encryption/impl/PgenCounterBuilder.java |  2 +-
 .../xmlsec/encryption/impl/PgenCounterImpl.java    |  2 +-
 .../xmlsec/encryption/impl/PublicBuilder.java      |  2 +-
 .../xmlsec/encryption/impl/PublicImpl.java         |  2 +-
 .../opensaml/xmlsec/encryption/impl/QBuilder.java  |  2 +-
 .../org/opensaml/xmlsec/encryption/impl/QImpl.java |  2 +-
 .../encryption/impl/RecipientKeyInfoBuilder.java   |  3 +-
 .../encryption/impl/RecipientKeyInfoImpl.java      |  3 +-
 .../encryption/impl/ReferenceListBuilder.java      |  2 +-
 .../xmlsec/encryption/impl/ReferenceListImpl.java  |  3 +-
 .../encryption/impl/ReferenceListUnmarshaller.java |  2 +-
 .../xmlsec/encryption/impl/ReferenceTypeImpl.java  |  7 +++--
 .../encryption/impl/ReferenceTypeMarshaller.java   |  2 +-
 .../encryption/impl/ReferenceTypeUnmarshaller.java |  4 +--
 .../xmlsec/encryption/impl/SeedBuilder.java        |  2 +-
 .../opensaml/xmlsec/encryption/impl/SeedImpl.java  |  2 +-
 .../xmlsec/encryption/impl/TransformsBuilder.java  |  2 +-
 .../xmlsec/encryption/impl/TransformsImpl.java     |  2 +-
 .../encryption/impl/TransformsUnmarshaller.java    |  2 +-
 .../impl/AbstractSecurityParametersResolver.java   |  2 +-
 .../impl/AlgorithmRuntimeSupportedPredicate.java   |  4 +--
 .../xmlsec/impl/BasicEncryptionConfiguration.java  |  4 +--
 .../impl/BasicEncryptionParametersResolver.java    |  6 ++--
 .../BasicSignatureSigningParametersResolver.java   |  2 +-
 .../impl/BasicWhitelistBlacklistConfiguration.java |  6 ++--
 .../opensaml/xmlsec/impl/BlacklistPredicate.java   |  4 +--
 .../impl/StaticDecryptionParametersResolver.java   |  6 ++--
 .../impl/StaticEncryptionParametersResolver.java   |  6 ++--
 .../StaticSignatureSigningParametersResolver.java  |  6 ++--
 ...taticSignatureValidationParametersResolver.java |  7 +++--
 .../opensaml/xmlsec/impl/WhitelistPredicate.java   |  4 +--
 .../keyinfo/impl/BasicKeyInfoGeneratorFactory.java | 14 +++++-----
 .../BasicProviderKeyInfoCredentialResolver.java    |  2 +-
 .../keyinfo/impl/StaticKeyInfoGenerator.java       |  4 +--
 .../keyinfo/impl/X509KeyInfoGeneratorFactory.java  | 32 +++++++++++-----------
 .../impl/provider/DEREncodedKeyValueProvider.java  |  2 +-
 .../keyinfo/impl/provider/DSAKeyValueProvider.java |  2 +-
 .../impl/provider/KeyInfoReferenceProvider.java    |  2 +-
 .../keyinfo/impl/provider/RSAKeyValueProvider.java |  2 +-
 .../xmlsec/signature/impl/CryptoBinaryBuilder.java |  2 +-
 .../xmlsec/signature/impl/CryptoBinaryImpl.java    |  6 ++--
 .../signature/impl/DEREncodedKeyValueBuilder.java  |  3 +-
 .../signature/impl/DEREncodedKeyValueImpl.java     |  5 ++--
 .../impl/DEREncodedKeyValueMarshaller.java         |  2 +-
 .../impl/DEREncodedKeyValueUnmarshaller.java       |  2 +-
 .../xmlsec/signature/impl/DSAKeyValueBuilder.java  |  2 +-
 .../xmlsec/signature/impl/DSAKeyValueImpl.java     | 16 +++++------
 .../signature/impl/DSAKeyValueUnmarshaller.java    |  2 +-
 .../xmlsec/signature/impl/DigestMethodBuilder.java |  2 +-
 .../xmlsec/signature/impl/DigestMethodImpl.java    |  6 ++--
 .../signature/impl/DigestMethodMarshaller.java     |  2 +-
 .../signature/impl/DigestMethodUnmarshaller.java   |  4 +--
 .../xmlsec/signature/impl/ECKeyValueBuilder.java   |  2 +-
 .../xmlsec/signature/impl/ECKeyValueImpl.java      | 10 +++----
 .../signature/impl/ECKeyValueMarshaller.java       |  2 +-
 .../signature/impl/ECKeyValueUnmarshaller.java     |  4 +--
 .../xmlsec/signature/impl/ECPointTypeImpl.java     |  2 +-
 .../xmlsec/signature/impl/ExponentBuilder.java     |  2 +-
 .../xmlsec/signature/impl/ExponentImpl.java        |  2 +-
 .../opensaml/xmlsec/signature/impl/GBuilder.java   |  2 +-
 .../org/opensaml/xmlsec/signature/impl/GImpl.java  |  2 +-
 .../opensaml/xmlsec/signature/impl/JBuilder.java   |  2 +-
 .../org/opensaml/xmlsec/signature/impl/JImpl.java  |  2 +-
 .../xmlsec/signature/impl/KeyInfoBuilder.java      |  2 +-
 .../xmlsec/signature/impl/KeyInfoImpl.java         |  6 ++--
 .../xmlsec/signature/impl/KeyInfoMarshaller.java   |  2 +-
 .../signature/impl/KeyInfoReferenceBuilder.java    |  3 +-
 .../signature/impl/KeyInfoReferenceImpl.java       |  7 +++--
 .../signature/impl/KeyInfoReferenceMarshaller.java |  2 +-
 .../impl/KeyInfoReferenceUnmarshaller.java         |  2 +-
 .../xmlsec/signature/impl/KeyInfoUnmarshaller.java |  4 +--
 .../xmlsec/signature/impl/KeyNameBuilder.java      |  2 +-
 .../xmlsec/signature/impl/KeyNameImpl.java         |  2 +-
 .../xmlsec/signature/impl/KeyValueBuilder.java     |  2 +-
 .../xmlsec/signature/impl/KeyValueImpl.java        | 10 +++----
 .../signature/impl/KeyValueUnmarshaller.java       |  2 +-
 .../xmlsec/signature/impl/MgmtDataBuilder.java     |  2 +-
 .../xmlsec/signature/impl/MgmtDataImpl.java        |  2 +-
 .../xmlsec/signature/impl/ModulusBuilder.java      |  2 +-
 .../xmlsec/signature/impl/ModulusImpl.java         |  2 +-
 .../xmlsec/signature/impl/NamedCurveBuilder.java   |  2 +-
 .../xmlsec/signature/impl/NamedCurveImpl.java      |  4 +--
 .../signature/impl/NamedCurveMarshaller.java       |  2 +-
 .../signature/impl/NamedCurveUnmarshaller.java     |  2 +-
 .../opensaml/xmlsec/signature/impl/PBuilder.java   |  2 +-
 .../xmlsec/signature/impl/PGPDataBuilder.java      |  2 +-
 .../xmlsec/signature/impl/PGPDataImpl.java         |  8 +++---
 .../xmlsec/signature/impl/PGPDataUnmarshaller.java |  2 +-
 .../xmlsec/signature/impl/PGPKeyIDBuilder.java     |  2 +-
 .../xmlsec/signature/impl/PGPKeyIDImpl.java        |  2 +-
 .../xmlsec/signature/impl/PGPKeyPacketBuilder.java |  2 +-
 .../xmlsec/signature/impl/PGPKeyPacketImpl.java    |  2 +-
 .../org/opensaml/xmlsec/signature/impl/PImpl.java  |  2 +-
 .../xmlsec/signature/impl/PgenCounterBuilder.java  |  2 +-
 .../xmlsec/signature/impl/PgenCounterImpl.java     |  2 +-
 .../xmlsec/signature/impl/PublicKeyBuilder.java    |  2 +-
 .../xmlsec/signature/impl/PublicKeyImpl.java       |  2 +-
 .../opensaml/xmlsec/signature/impl/QBuilder.java   |  2 +-
 .../org/opensaml/xmlsec/signature/impl/QImpl.java  |  2 +-
 .../xmlsec/signature/impl/RSAKeyValueBuilder.java  |  2 +-
 .../xmlsec/signature/impl/RSAKeyValueImpl.java     |  6 ++--
 .../signature/impl/RSAKeyValueUnmarshaller.java    |  2 +-
 .../signature/impl/RetrievalMethodBuilder.java     |  3 +-
 .../xmlsec/signature/impl/RetrievalMethodImpl.java |  9 +++---
 .../signature/impl/RetrievalMethodMarshaller.java  |  2 +-
 .../impl/RetrievalMethodUnmarshaller.java          |  4 +--
 .../xmlsec/signature/impl/SPKIDataBuilder.java     |  2 +-
 .../xmlsec/signature/impl/SPKIDataImpl.java        |  4 +--
 .../signature/impl/SPKIDataUnmarshaller.java       |  2 +-
 .../xmlsec/signature/impl/SPKISexpBuilder.java     |  2 +-
 .../xmlsec/signature/impl/SPKISexpImpl.java        |  2 +-
 .../xmlsec/signature/impl/SeedBuilder.java         |  2 +-
 .../opensaml/xmlsec/signature/impl/SeedImpl.java   |  2 +-
 .../xmlsec/signature/impl/SignatureBuilder.java    |  2 +-
 .../xmlsec/signature/impl/SignatureImpl.java       | 14 +++++-----
 .../xmlsec/signature/impl/SignatureMarshaller.java | 11 ++++----
 .../signature/impl/SignatureUnmarshaller.java      |  6 ++--
 .../xmlsec/signature/impl/TransformBuilder.java    |  2 +-
 .../xmlsec/signature/impl/TransformImpl.java       |  6 ++--
 .../xmlsec/signature/impl/TransformMarshaller.java |  2 +-
 .../signature/impl/TransformUnmarshaller.java      |  4 +--
 .../xmlsec/signature/impl/TransformsBuilder.java   |  2 +-
 .../xmlsec/signature/impl/TransformsImpl.java      |  2 +-
 .../signature/impl/TransformsUnmarshaller.java     |  2 +-
 .../xmlsec/signature/impl/X509CRLBuilder.java      |  2 +-
 .../xmlsec/signature/impl/X509CRLImpl.java         |  4 +--
 .../signature/impl/X509CertificateBuilder.java     |  3 +-
 .../xmlsec/signature/impl/X509CertificateImpl.java |  5 ++--
 .../xmlsec/signature/impl/X509DataBuilder.java     |  2 +-
 .../xmlsec/signature/impl/X509DataImpl.java        |  4 +--
 .../signature/impl/X509DataUnmarshaller.java       |  2 +-
 .../xmlsec/signature/impl/X509DigestBuilder.java   |  2 +-
 .../xmlsec/signature/impl/X509DigestImpl.java      |  4 +--
 .../signature/impl/X509DigestMarshaller.java       |  2 +-
 .../signature/impl/X509DigestUnmarshaller.java     |  2 +-
 .../signature/impl/X509IssuerNameBuilder.java      |  2 +-
 .../xmlsec/signature/impl/X509IssuerNameImpl.java  |  3 +-
 .../signature/impl/X509IssuerSerialBuilder.java    |  3 +-
 .../signature/impl/X509IssuerSerialImpl.java       |  7 +++--
 .../impl/X509IssuerSerialUnmarshaller.java         |  2 +-
 .../xmlsec/signature/impl/X509SKIBuilder.java      |  2 +-
 .../xmlsec/signature/impl/X509SKIImpl.java         |  2 +-
 .../signature/impl/X509SerialNumberBuilder.java    |  3 +-
 .../signature/impl/X509SerialNumberImpl.java       |  5 ++--
 .../signature/impl/X509SerialNumberMarshaller.java |  5 ++--
 .../impl/X509SerialNumberUnmarshaller.java         |  6 ++--
 .../signature/impl/X509SubjectNameBuilder.java     |  3 +-
 .../xmlsec/signature/impl/X509SubjectNameImpl.java |  3 +-
 .../xmlsec/signature/impl/XPathBuilder.java        |  2 +-
 .../opensaml/xmlsec/signature/impl/XPathImpl.java  |  2 +-
 .../opensaml/xmlsec/signature/impl/YBuilder.java   |  2 +-
 .../org/opensaml/xmlsec/signature/impl/YImpl.java  |  2 +-
 .../support/impl/BaseSignatureTrustEngine.java     |  6 ++--
 ...heSantuarioSignatureValidationProviderImpl.java |  2 +-
 .../ApacheSantuarioSignerProviderImpl.java         |  2 +-
 216 files changed, 406 insertions(+), 367 deletions(-)

diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
index 0171e9e..d3ed8df 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
@@ -67,12 +67,12 @@ public class JavaCryptoValidationInitializer implements Initializer {
         
         try {
             Cipher.getInstance("AES/CBC/ISO10126Padding");
-        } catch (NoSuchAlgorithmException e) {
+        } catch (final NoSuchAlgorithmException e) {
             // IBM JCE returns this as the top-level exception even for the unsupported padding case. :-(
             // Otherwise would be nice to make the error msg more specific.
             log.warn(errorMsgAESPadding);
             valid = false;
-        } catch (NoSuchPaddingException e) {
+        } catch (final NoSuchPaddingException e) {
             log.warn(errorMsgAESPadding);
             valid = false;
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodBuilder.java
index d9612e5..0e627a7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodBuilder.java
@@ -36,7 +36,8 @@ public class AgreementMethodBuilder extends AbstractXMLObjectBuilder<AgreementMe
     }
 
     /** {@inheritDoc} */
-    public AgreementMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AgreementMethod buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new AgreementMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
index e97c08a..e228ef6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
@@ -58,7 +58,8 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
      * @param elementLocalName element local name
      * @param namespacePrefix namespace prefix
      */
-    protected AgreementMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AgreementMethodImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         xmlChildren = new IndexedXMLObjectChildrenList(this);
     }
@@ -69,7 +70,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         this.algorithm = prepareForAssignment(this.algorithm, newAlgorithm);
     }
 
@@ -79,7 +80,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
     }
 
     /** {@inheritDoc} */
-    public void setKANonce(KANonce newKANonce) {
+    public void setKANonce(final KANonce newKANonce) {
         this.kaNonce = prepareForAssignment(this.kaNonce, newKANonce);
     }
 
@@ -89,7 +90,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
     }
 
     /** {@inheritDoc} */
-    public void setOriginatorKeyInfo(OriginatorKeyInfo newOriginatorKeyInfo) {
+    public void setOriginatorKeyInfo(final OriginatorKeyInfo newOriginatorKeyInfo) {
         this.originatorKeyInfo = prepareForAssignment(this.originatorKeyInfo, newOriginatorKeyInfo);
     }
 
@@ -99,7 +100,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
     }
 
     /** {@inheritDoc} */
-    public void setRecipientKeyInfo(RecipientKeyInfo newRecipientKeyInfo) {
+    public void setRecipientKeyInfo(final RecipientKeyInfo newRecipientKeyInfo) {
         this.recipientKeyInfo = prepareForAssignment(this.recipientKeyInfo, newRecipientKeyInfo);
     }
 
@@ -108,7 +109,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
         return (List<XMLObject>) this.xmlChildren;
     }
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) this.xmlChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
index fe9c0f2..eb11cc7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AgreementMethodMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AgreementMethod am = (AgreementMethod) xmlObject;
 
         if (am.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
index f1f0e3e..32cea70 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Attr;
 public class AgreementMethodUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AgreementMethod am = (AgreementMethod) xmlObject;
 
         if (attribute.getLocalName().equals(AgreementMethod.ALGORITHM_ATTRIBUTE_NAME)) {
@@ -42,7 +42,7 @@ public class AgreementMethodUnmarshaller extends AbstractXMLEncryptionUnmarshall
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         AgreementMethod am = (AgreementMethod) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
index 7ec17cd..cdd14cf 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
@@ -45,7 +45,8 @@ public abstract class AlgorithmIdentifierTypeImpl extends AbstractXMLObject impl
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected AlgorithmIdentifierTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AlgorithmIdentifierTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +56,7 @@ public abstract class AlgorithmIdentifierTypeImpl extends AbstractXMLObject impl
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(@Nullable String newAlgorithm) {
+    public void setAlgorithm(@Nullable final String newAlgorithm) {
         algorithm = prepareForAssignment(this.algorithm, newAlgorithm);
     }
 
@@ -65,7 +66,7 @@ public abstract class AlgorithmIdentifierTypeImpl extends AbstractXMLObject impl
     }
 
     /** {@inheritDoc} */
-    public void setParameters(@Nullable XMLObject newParameters) {
+    public void setParameters(@Nullable final XMLObject newParameters) {
         parameters = prepareForAssignment(parameters, newParameters);
     }
     
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
index f90a87c..a50d2a1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AlgorithmIdentifierTypeMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
 
         if (algoIdType.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
index ef2dcd3..4a22bae 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class AlgorithmIdentifierTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
 
         if (attribute.getLocalName().equals(AlgorithmIdentifierType.ALGORITHM_ATTRIB_NAME)) {
@@ -43,7 +43,7 @@ public class AlgorithmIdentifierTypeUnmarshaller extends AbstractXMLEncryptionUn
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) parentXMLObject;
         
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameBuilder.java
index 5ebb9e9..8a4e67d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameBuilder.java
@@ -33,7 +33,7 @@ public class CarriedKeyNameBuilder extends AbstractXMLObjectBuilder<CarriedKeyNa
     }
 
     /** {@inheritDoc} */
-    public CarriedKeyName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CarriedKeyName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new CarriedKeyNameImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameImpl.java
index 819aedc..e6bf2ff 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CarriedKeyNameImpl.java
@@ -32,7 +32,8 @@ public class CarriedKeyNameImpl extends XSStringImpl implements CarriedKeyName {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected CarriedKeyNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected CarriedKeyNameImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataBuilder.java
index fc06b7f..69c932d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataBuilder.java
@@ -33,7 +33,7 @@ public class CipherDataBuilder extends AbstractXMLObjectBuilder<CipherData> impl
     }
 
     /** {@inheritDoc} */
-    public CipherData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CipherData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new CipherDataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
index 0454a14..14f3169 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
@@ -45,7 +45,7 @@ public class CipherDataImpl extends AbstractXMLObject implements CipherData {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected  CipherDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected  CipherDataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class CipherDataImpl extends AbstractXMLObject implements CipherData {
     }
 
     /** {@inheritDoc} */
-    public void setCipherValue(CipherValue newCipherValue) {
+    public void setCipherValue(final CipherValue newCipherValue) {
         this.cipherValue = prepareForAssignment(this.cipherValue, newCipherValue);
     }
 
@@ -65,7 +65,7 @@ public class CipherDataImpl extends AbstractXMLObject implements CipherData {
     }
 
     /** {@inheritDoc} */
-    public void setCipherReference(CipherReference newCipherReference) {
+    public void setCipherReference(final CipherReference newCipherReference) {
         this.cipherReference = prepareForAssignment(this.cipherReference, newCipherReference);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
index 18fca2a..3bc086b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.xmlsec.encryption.CipherValue;
 public class CipherDataUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         CipherData cipherData = (CipherData) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceBuilder.java
index e2840fd..9550353 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceBuilder.java
@@ -33,7 +33,8 @@ public class CipherReferenceBuilder extends AbstractXMLObjectBuilder<CipherRefer
     }
 
     /** {@inheritDoc} */
-    public CipherReference buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CipherReference buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new CipherReferenceImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
index fc90fc0..ad1e1b4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
@@ -44,7 +44,8 @@ public class CipherReferenceImpl extends AbstractXMLObject implements CipherRefe
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected CipherReferenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected CipherReferenceImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -54,7 +55,7 @@ public class CipherReferenceImpl extends AbstractXMLObject implements CipherRefe
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         this.uri = prepareForAssignment(this.uri, newURI);
     }
 
@@ -64,7 +65,7 @@ public class CipherReferenceImpl extends AbstractXMLObject implements CipherRefe
     }
 
     /** {@inheritDoc} */
-    public void setTransforms(Transforms newTransforms) {
+    public void setTransforms(final Transforms newTransforms) {
         this.transforms = prepareForAssignment(this.transforms, newTransforms);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
index b040a2d..085ab3a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class CipherReferenceMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         CipherReference cr = (CipherReference) xmlObject;
 
         if (cr.getURI() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
index 5db0c37..46e384f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class CipherReferenceUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         CipherReference cr = (CipherReference) xmlObject;
 
         if (attribute.getLocalName().equals(CipherReference.URI_ATTRIB_NAME)) {
@@ -40,7 +40,7 @@ public class CipherReferenceUnmarshaller extends AbstractXMLEncryptionUnmarshall
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         CipherReference cr = (CipherReference) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueBuilder.java
index 28cdec6..7231c14 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueBuilder.java
@@ -33,7 +33,7 @@ public class CipherValueBuilder extends AbstractXMLObjectBuilder<CipherValue> im
     }
 
     /** {@inheritDoc} */
-    public CipherValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CipherValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new CipherValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueImpl.java
index 031c3df..1447a70 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherValueImpl.java
@@ -32,7 +32,7 @@ public class CipherValueImpl extends XSBase64BinaryImpl implements CipherValue {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected CipherValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected CipherValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueBuilder.java
index 17ed3c2..5a6239b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueBuilder.java
@@ -33,7 +33,7 @@ public class DHKeyValueBuilder
     }
 
     /** {@inheritDoc} */
-    public DHKeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DHKeyValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DHKeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
index cbb1a52..1c8f8bb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
@@ -61,7 +61,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected DHKeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DHKeyValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -71,7 +71,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setP(P newP) {
+    public void setP(final P newP) {
         this.p = prepareForAssignment(this.p, newP);
     }
 
@@ -81,7 +81,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setQ(Q newQ) {
+    public void setQ(final Q newQ) {
         this.q = prepareForAssignment(this.q, newQ);
     }
 
@@ -91,7 +91,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setGenerator(Generator newGenerator) {
+    public void setGenerator(final Generator newGenerator) {
         this.generator = prepareForAssignment(this.generator, newGenerator);
     }
 
@@ -101,7 +101,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setPublic(Public newPublic) {
+    public void setPublic(final Public newPublic) {
         this.publicChild = prepareForAssignment(this.publicChild, newPublic);
     }
 
@@ -111,7 +111,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setSeed(Seed newSeed) {
+    public void setSeed(final Seed newSeed) {
         this.seed = prepareForAssignment(this.seed, newSeed);
     }
 
@@ -121,7 +121,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setPgenCounter(PgenCounter newPgenCounter) {
+    public void setPgenCounter(final PgenCounter newPgenCounter) {
         this.pgenCounter = prepareForAssignment(this.pgenCounter, newPgenCounter);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
index 9a51830..e8d9da6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
@@ -33,7 +33,7 @@ import org.opensaml.xmlsec.encryption.Seed;
 public class DHKeyValueUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         DHKeyValue keyValue = (DHKeyValue) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceBuilder.java
index 99bf59d..c95b8af 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceBuilder.java
@@ -33,7 +33,7 @@ public class DataReferenceBuilder extends AbstractXMLObjectBuilder<DataReference
     }
 
     /** {@inheritDoc} */
-    public DataReference buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DataReference buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DataReferenceImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceImpl.java
index b7052b7..f194189 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DataReferenceImpl.java
@@ -31,7 +31,8 @@ public class DataReferenceImpl extends ReferenceTypeImpl implements DataReferenc
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected DataReferenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DataReferenceImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataBuilder.java
index 6c2e6b5..8a51f3b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataBuilder.java
@@ -39,7 +39,7 @@ public class EncryptedDataBuilder extends AbstractXMLObjectBuilder<EncryptedData
     }
 
     /** {@inheritDoc} */
-    public EncryptedData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptedData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptedDataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataImpl.java
index f03f822..b84f61e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataImpl.java
@@ -31,7 +31,8 @@ public class EncryptedDataImpl extends EncryptedTypeImpl implements EncryptedDat
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptedDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedDataImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyBuilder.java
index 716afcb..cd1a3ac 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyBuilder.java
@@ -39,7 +39,7 @@ public class EncryptedKeyBuilder extends AbstractXMLObjectBuilder<EncryptedKey>
     }
 
     /** {@inheritDoc} */
-    public EncryptedKey buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptedKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptedKeyImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
index b06cc00..8640f7f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
@@ -47,7 +47,7 @@ public class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptedKeyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedKeyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey
     }
 
     /** {@inheritDoc} */
-    public void setRecipient(String newRecipient) {
+    public void setRecipient(final String newRecipient) {
         this.recipient = prepareForAssignment(this.recipient, newRecipient);
     }
 
@@ -67,7 +67,7 @@ public class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey
     }
 
     /** {@inheritDoc} */
-    public void setReferenceList(ReferenceList newReferenceList) {
+    public void setReferenceList(final ReferenceList newReferenceList) {
         this.referenceList = prepareForAssignment(this.referenceList, newReferenceList);
     }
 
@@ -77,7 +77,7 @@ public class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey
     }
 
     /** {@inheritDoc} */
-    public void setCarriedKeyName(CarriedKeyName newCarriedKeyName) {
+    public void setCarriedKeyName(final CarriedKeyName newCarriedKeyName) {
         this.carriedKeyName = prepareForAssignment(this.carriedKeyName, newCarriedKeyName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
index 7040aa5..00b3bda 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class EncryptedKeyMarshaller extends EncryptedTypeMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EncryptedKey ek = (EncryptedKey) xmlObject;
 
         if (ek.getRecipient() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
index 5fd88ec..b1cca44 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Attr;
 public class EncryptedKeyUnmarshaller extends EncryptedTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         EncryptedKey ek = (EncryptedKey) xmlObject;
 
         if (attribute.getLocalName().equals(EncryptedKey.RECIPIENT_ATTRIB_NAME)) {
@@ -41,7 +41,7 @@ public class EncryptedKeyUnmarshaller extends EncryptedTypeUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EncryptedKey ek = (EncryptedKey) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
index 9398340..d7c8a64 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
@@ -65,7 +65,8 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptedTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -75,7 +76,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
     
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -87,7 +88,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
     
     /** {@inheritDoc} */
-    public void setType(String newType) {
+    public void setType(final String newType) {
         this.type = prepareForAssignment(this.type, newType);
     }
     
@@ -97,7 +98,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
     
     /** {@inheritDoc} */
-    public void setMimeType(String newMimeType) {
+    public void setMimeType(final String newMimeType) {
         this.mimeType = prepareForAssignment(this.mimeType, newMimeType);
     }
     
@@ -107,7 +108,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
     
     /** {@inheritDoc} */
-    public void setEncoding(String newEncoding) {
+    public void setEncoding(final String newEncoding) {
         this.encoding = prepareForAssignment(this.encoding, newEncoding);
     }
 
@@ -117,7 +118,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
 
     /** {@inheritDoc} */
-    public void setEncryptionMethod(EncryptionMethod newEncryptionMethod) {
+    public void setEncryptionMethod(final EncryptionMethod newEncryptionMethod) {
         this.encryptionMethod = prepareForAssignment(this.encryptionMethod, newEncryptionMethod);
     }
 
@@ -127,7 +128,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
 
     /** {@inheritDoc} */
-    public void setKeyInfo(KeyInfo newKeyInfo) {
+    public void setKeyInfo(final KeyInfo newKeyInfo) {
         this.keyInfo = prepareForAssignment(this.keyInfo, newKeyInfo);
     }
 
@@ -137,7 +138,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
 
     /** {@inheritDoc} */
-    public void setCipherData(CipherData newCipherData) {
+    public void setCipherData(final CipherData newCipherData) {
         this.cipherData = prepareForAssignment(this.cipherData, newCipherData);
     }
 
@@ -147,7 +148,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
     }
 
     /** {@inheritDoc} */
-    public void setEncryptionProperties(EncryptionProperties newEncryptionProperties) {
+    public void setEncryptionProperties(final EncryptionProperties newEncryptionProperties) {
         this.encryptionProperties = prepareForAssignment(this.encryptionProperties, newEncryptionProperties);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
index f3b8ac1..b9aeea1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public abstract class EncryptedTypeMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EncryptedType et = (EncryptedType) xmlObject;
 
         if (et.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
index 91d2db7..5467915 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public abstract class EncryptedTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EncryptedType et = (EncryptedType) parentXMLObject;
 
@@ -51,7 +51,7 @@ public abstract class EncryptedTypeUnmarshaller extends AbstractXMLEncryptionUnm
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         EncryptedType et = (EncryptedType) xmlObject;
 
         if (attribute.getLocalName().equals(EncryptedType.ID_ATTRIB_NAME)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodBuilder.java
index d2c54ac..7be59f8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodBuilder.java
@@ -36,7 +36,8 @@ public class EncryptionMethodBuilder extends AbstractXMLObjectBuilder<Encryption
     }
 
     /** {@inheritDoc} */
-    public EncryptionMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptionMethod buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EncryptionMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
index 1f40493..6c91db7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
@@ -54,7 +54,8 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptionMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptionMethodImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -66,7 +67,7 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         this.algorithm = prepareForAssignment(this.algorithm, newAlgorithm);
     }
 
@@ -76,7 +77,7 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
     }
 
     /** {@inheritDoc} */
-    public void setKeySize(KeySize newKeySize) {
+    public void setKeySize(final KeySize newKeySize) {
         this.keySize = prepareForAssignment(this.keySize, newKeySize);
     }
 
@@ -86,7 +87,7 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
     }
 
     /** {@inheritDoc} */
-    public void setOAEPparams(OAEPparams newOAEPparams) {
+    public void setOAEPparams(final OAEPparams newOAEPparams) {
         this.oaepParams = prepareForAssignment(this.oaepParams, newOAEPparams);
     }
 
@@ -95,7 +96,7 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
         return this.unknownChildren;
     }
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
index ea45f8b..3423622 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class EncryptionMethodMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EncryptionMethod em = (EncryptionMethod) xmlObject;
 
         if (em.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
index 769994a..3ac4999 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Attr;
 public class EncryptionMethodUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         EncryptionMethod em = (EncryptionMethod) xmlObject;
 
         if (attribute.getLocalName().equals(EncryptionMethod.ALGORITHM_ATTRIB_NAME)) {
@@ -41,7 +41,7 @@ public class EncryptionMethodUnmarshaller extends AbstractXMLEncryptionUnmarshal
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EncryptionMethod em = (EncryptionMethod) parentXMLObject;
         if (childXMLObject instanceof KeySize) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesBuilder.java
index fc2f757..6cbc0c3 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesBuilder.java
@@ -36,7 +36,8 @@ public class EncryptionPropertiesBuilder extends AbstractXMLObjectBuilder<Encryp
     }
 
     /** {@inheritDoc} */
-    public EncryptionProperties buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptionProperties buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EncryptionPropertiesImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
index d37b4a4..6ce68e8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
@@ -45,7 +45,8 @@ public class EncryptionPropertiesImpl extends AbstractXMLObject implements Encry
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptionPropertiesImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptionPropertiesImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         encryptionProperties = new XMLObjectChildrenList<EncryptionProperty>(this);
     }
@@ -56,7 +57,7 @@ public class EncryptionPropertiesImpl extends AbstractXMLObject implements Encry
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
index aff3a89..68be3f7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class EncryptionPropertiesMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EncryptionProperties ep = (EncryptionProperties) xmlObject;
 
         if (ep.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
index 21908dd..3c8f14d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class EncryptionPropertiesUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         EncryptionProperties ep = (EncryptionProperties) xmlObject;
 
         if (attribute.getLocalName().equals(EncryptionProperties.ID_ATTRIB_NAME)) {
@@ -41,7 +41,7 @@ public class EncryptionPropertiesUnmarshaller extends AbstractXMLEncryptionUnmar
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EncryptionProperties ep = (EncryptionProperties) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyBuilder.java
index 2bb6821..bc4a342 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyBuilder.java
@@ -35,7 +35,8 @@ public class EncryptionPropertyBuilder extends AbstractXMLObjectBuilder<Encrypti
     }
 
     /** {@inheritDoc} */
-    public EncryptionProperty buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptionProperty buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EncryptionPropertyImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
index 9d581c2..10b26ed 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
@@ -53,7 +53,8 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected EncryptionPropertyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptionPropertyImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
         unknownAttributes =  new AttributeMap(this);
@@ -65,7 +66,7 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setTarget(String newTarget) {
+    public void setTarget(final String newTarget) {
         this.target = prepareForAssignment(this.target, newTarget);
     }
 
@@ -75,7 +76,7 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -91,7 +92,7 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
         return (List<XMLObject>) unknownChildren;
     }
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
index aa4761f..4656ee0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
 public class EncryptionPropertyMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EncryptionProperty ep = (EncryptionProperty) xmlObject;
 
         if (ep.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
index 646358f..d289868 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class EncryptionPropertyUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         EncryptionProperty ep = (EncryptionProperty) xmlObject;
 
         if (attribute.getLocalName().equals(EncryptionProperty.ID_ATTRIB_NAME)) {
@@ -50,7 +50,7 @@ public class EncryptionPropertyUnmarshaller extends AbstractXMLEncryptionUnmarsh
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EncryptionProperty ep = (EncryptionProperty) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorBuilder.java
index efae8d3..4bc8882 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorBuilder.java
@@ -35,7 +35,7 @@ public class GeneratorBuilder extends AbstractXMLObjectBuilder<Generator> implem
     }
 
     /** {@inheritDoc} */
-    public Generator buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Generator buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GeneratorImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorImpl.java
index fa1f4c0..565503b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/GeneratorImpl.java
@@ -33,7 +33,7 @@ public class GeneratorImpl extends CryptoBinaryImpl implements Generator {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected GeneratorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GeneratorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceBuilder.java
index ae2c03b..c5f0ca2 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceBuilder.java
@@ -34,7 +34,7 @@ public class KANonceBuilder extends AbstractXMLObjectBuilder<KANonce> implements
     }
 
     /** {@inheritDoc} */
-    public KANonce buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KANonce buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KANonceImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceImpl.java
index 1569565..ccc9237 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KANonceImpl.java
@@ -32,7 +32,7 @@ public class KANonceImpl extends XSBase64BinaryImpl implements KANonce {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected KANonceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KANonceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceBuilder.java
index 722a78e..9bf9d2a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceBuilder.java
@@ -35,7 +35,7 @@ public class KeyReferenceBuilder extends AbstractXMLObjectBuilder<KeyReference>
     }
 
     /** {@inheritDoc} */
-    public KeyReference buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyReference buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyReferenceImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceImpl.java
index 0288f69..69e1e2c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceImpl.java
@@ -31,7 +31,7 @@ public class KeyReferenceImpl extends ReferenceTypeImpl implements KeyReference
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected KeyReferenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyReferenceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeBuilder.java
index f2c4328..88314af 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeBuilder.java
@@ -34,7 +34,7 @@ public class KeySizeBuilder extends AbstractXMLObjectBuilder<KeySize> implements
     }
 
     /** {@inheritDoc} */
-    public KeySize buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeySize buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeySizeImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeImpl.java
index 4278981..ecdd0d0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/KeySizeImpl.java
@@ -32,7 +32,7 @@ public class KeySizeImpl extends XSIntegerImpl implements KeySize {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected KeySizeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeySizeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFBuilder.java
index 831f61d..fcb841d7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFBuilder.java
@@ -34,7 +34,7 @@ public class MGFBuilder extends AbstractXMLObjectBuilder<MGF> implements XMLEncr
     }
 
     /** {@inheritDoc} */
-    public MGF buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public MGF buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new MGFImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFImpl.java
index e005f82..8af3d9f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFImpl.java
@@ -31,7 +31,7 @@ public class MGFImpl extends AlgorithmIdentifierTypeImpl implements MGF {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected MGFImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected MGFImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsBuilder.java
index 7f65f0a..b77b297 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsBuilder.java
@@ -35,7 +35,7 @@ public class OAEPparamsBuilder
     }
 
     /** {@inheritDoc} */
-    public OAEPparams buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OAEPparams buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OAEPparamsImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsImpl.java
index 3e8c5b6..e4e4569 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsImpl.java
@@ -32,7 +32,7 @@ public class OAEPparamsImpl extends XSBase64BinaryImpl implements OAEPparams {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected OAEPparamsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OAEPparamsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoBuilder.java
index 1fcb8dd..a0d3469 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoBuilder.java
@@ -35,7 +35,8 @@ public class OriginatorKeyInfoBuilder extends AbstractXMLObjectBuilder<Originato
     }
 
     /** {@inheritDoc} */
-    public OriginatorKeyInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OriginatorKeyInfo buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new OriginatorKeyInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoImpl.java
index e34a1a7..246068d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoImpl.java
@@ -32,7 +32,8 @@ public class OriginatorKeyInfoImpl extends KeyInfoImpl implements OriginatorKeyI
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected OriginatorKeyInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OriginatorKeyInfoImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PBuilder.java
index 2d8b49a..d8ebdb4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PBuilder.java
@@ -34,7 +34,7 @@ public class PBuilder extends AbstractXMLObjectBuilder<P> implements XMLEncrypti
     }
 
     /** {@inheritDoc} */
-    public P buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public P buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PImpl.java
index 61cca6e..a4805d2 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PImpl.java
@@ -33,7 +33,7 @@ public class PImpl extends CryptoBinaryImpl implements P {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected PImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterBuilder.java
index 0539128..7e4c413 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterBuilder.java
@@ -35,7 +35,7 @@ public class PgenCounterBuilder extends AbstractXMLObjectBuilder<PgenCounter> im
     }
 
     /** {@inheritDoc} */
-    public PgenCounter buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PgenCounter buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PgenCounterImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterImpl.java
index e341852..8c66314 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PgenCounterImpl.java
@@ -33,7 +33,7 @@ public class PgenCounterImpl extends CryptoBinaryImpl implements PgenCounter {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected PgenCounterImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PgenCounterImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicBuilder.java
index 9fcbc30..db543d0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicBuilder.java
@@ -34,7 +34,7 @@ public class PublicBuilder extends AbstractXMLObjectBuilder<Public> implements X
     }
 
     /** {@inheritDoc} */
-    public Public buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Public buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PublicImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicImpl.java
index 8486402..76074dc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/PublicImpl.java
@@ -33,7 +33,7 @@ public class PublicImpl extends CryptoBinaryImpl implements Public {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected PublicImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PublicImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QBuilder.java
index 801227b..1d87774 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QBuilder.java
@@ -34,7 +34,7 @@ public class QBuilder extends AbstractXMLObjectBuilder<Q> implements XMLEncrypti
     }
 
     /** {@inheritDoc} */
-    public Q buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Q buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new QImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QImpl.java
index 4965d21..72cc4e4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/QImpl.java
@@ -33,7 +33,7 @@ public class QImpl extends CryptoBinaryImpl implements Q {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected QImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected QImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoBuilder.java
index 3da409c..f811dd8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoBuilder.java
@@ -35,7 +35,8 @@ public class RecipientKeyInfoBuilder extends AbstractXMLObjectBuilder<RecipientK
     }
 
     /** {@inheritDoc} */
-    public RecipientKeyInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RecipientKeyInfo buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new RecipientKeyInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoImpl.java
index beca21b..07afce7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoImpl.java
@@ -32,7 +32,8 @@ public class RecipientKeyInfoImpl extends KeyInfoImpl implements RecipientKeyInf
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected RecipientKeyInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RecipientKeyInfoImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListBuilder.java
index 00681d1..0e4f5fd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListBuilder.java
@@ -35,7 +35,7 @@ public class ReferenceListBuilder extends AbstractXMLObjectBuilder<ReferenceList
     }
 
     /** {@inheritDoc} */
-    public ReferenceList buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ReferenceList buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ReferenceListImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
index 3fff936..63e6dc6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
@@ -44,7 +44,8 @@ public class ReferenceListImpl extends AbstractXMLObject implements ReferenceLis
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected ReferenceListImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ReferenceListImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList<ReferenceType>(this);
     }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
index a49b762..340e0ab 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.xmlsec.encryption.ReferenceList;
 public class ReferenceListUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ReferenceList rl = (ReferenceList) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
index ea626d1..17369d9 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
@@ -46,7 +46,8 @@ public class ReferenceTypeImpl extends AbstractXMLObject implements ReferenceTyp
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected ReferenceTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ReferenceTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         xmlChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -57,7 +58,7 @@ public class ReferenceTypeImpl extends AbstractXMLObject implements ReferenceTyp
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         this.uri = prepareForAssignment(this.uri, newURI);
     }
 
@@ -67,7 +68,7 @@ public class ReferenceTypeImpl extends AbstractXMLObject implements ReferenceTyp
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) xmlChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
index 426cb9b..c2cefe7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class ReferenceTypeMarshaller extends AbstractXMLEncryptionMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ReferenceType rt = (ReferenceType) xmlObject;
 
         if (rt.getURI() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
index 121cc6d..cb948d0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class ReferenceTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         ReferenceType rt = (ReferenceType) xmlObject;
 
         if (attribute.getLocalName().equals(ReferenceType.URI_ATTRIB_NAME)) {
@@ -39,7 +39,7 @@ public class ReferenceTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ReferenceType rt = (ReferenceType) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedBuilder.java
index 33711a5..a363522 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedBuilder.java
@@ -34,7 +34,7 @@ public class SeedBuilder extends AbstractXMLObjectBuilder<Seed> implements XMLEn
     }
 
     /** {@inheritDoc} */
-    public Seed buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Seed buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SeedImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedImpl.java
index 333fad5..70d1dcf 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/SeedImpl.java
@@ -33,7 +33,7 @@ public class SeedImpl extends CryptoBinaryImpl implements Seed {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected SeedImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SeedImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsBuilder.java
index 9fbc4b0..7d0730e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsBuilder.java
@@ -35,7 +35,7 @@ public class TransformsBuilder
     }
 
     /** {@inheritDoc} */
-    public Transforms buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Transforms buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new TransformsImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
index e6eb9a2..520d354 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
@@ -42,7 +42,7 @@ public class TransformsImpl extends AbstractXMLObject implements Transforms {
      * @param elementLocalName local name
      * @param namespacePrefix namespace prefix
      */
-    protected TransformsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TransformsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         transforms = new XMLObjectChildrenList<Transform>(this);
     }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
index bb69edd..1c17755 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.xmlsec.signature.Transform;
 public class TransformsUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         Transforms transforms = (Transforms) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
index b203267..89f71f1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
@@ -67,7 +67,7 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
      * @return the resolved KeyInfo generator instance, or null
      */
     @Nullable protected KeyInfoGenerator lookupKeyInfoGenerator(@Nonnull final Credential credential, 
-            @Nullable final NamedKeyInfoGeneratorManager manager, @Nullable String keyInfoProfileName) {
+            @Nullable final NamedKeyInfoGeneratorManager manager, @Nullable final String keyInfoProfileName) {
         Constraint.isNotNull(credential, "Credential may not be null");
         
         if (manager == null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicate.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicate.java
index efa30c2..55cb88a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicate.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AlgorithmRuntimeSupportedPredicate.java
@@ -39,12 +39,12 @@ public class AlgorithmRuntimeSupportedPredicate implements Predicate<String> {
      *
      * @param algorithmRegistry the algorithm registry instance to use
      */
-    public AlgorithmRuntimeSupportedPredicate(AlgorithmRegistry algorithmRegistry) {
+    public AlgorithmRuntimeSupportedPredicate(final AlgorithmRegistry algorithmRegistry) {
         registry = Constraint.isNotNull(algorithmRegistry, "AlgorithmRegistry may not be null");
     }
 
     /** {@inheritDoc} */
-    public boolean apply(@Nullable String input) {
+    public boolean apply(@Nullable final String input) {
         return registry.isRuntimeSupported(input);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
index 2e7fac2..d04feaa 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
@@ -229,7 +229,7 @@ public class BasicEncryptionConfiguration extends BasicWhitelistBlacklistConfigu
      * 
      * @param flag true if should merge, false otherwise
      */
-    public void setRSAOAEPParametersMerge(boolean flag) {
+    public void setRSAOAEPParametersMerge(final boolean flag) {
         rsaOAEPParametersMerge = flag;
     }
     
@@ -244,7 +244,7 @@ public class BasicEncryptionConfiguration extends BasicWhitelistBlacklistConfigu
      * 
      * @param predicate the new predicate instance
      */
-    public void setKeyTransportAlgorithmPredicate(KeyTransportAlgorithmPredicate predicate) {
+    public void setKeyTransportAlgorithmPredicate(final KeyTransportAlgorithmPredicate predicate) {
         keyTransportPredicate = predicate;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
index 9cf2461..e08a1a6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
@@ -119,7 +119,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
      * 
      * @param flag true if should auto-generate, false otherwise
      */
-    public void setAutoGenerateDataEncryptionCredential(boolean flag) {
+    public void setAutoGenerateDataEncryptionCredential(final boolean flag) {
         autoGenerateDataEncryptionCredential = flag;
     }
 
@@ -764,7 +764,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
      * 
      * @return true if is a key transport algorithm URI, false otherwise
      */
-    protected boolean isDataEncryptionAlgorithm(String algorithm) {
+    protected boolean isDataEncryptionAlgorithm(final String algorithm) {
         
         return AlgorithmSupport.isDataEncryptionAlgorithm(getAlgorithmRegistry().get(algorithm));
     }
@@ -779,7 +779,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
     @Nullable protected Credential generateDataEncryptionCredential(@Nonnull final String dataEncryptionAlgorithm) {
         try {
             return AlgorithmSupport.generateSymmetricKeyAndCredential(dataEncryptionAlgorithm);
-        } catch (NoSuchAlgorithmException | KeyException e) {
+        } catch (final NoSuchAlgorithmException | KeyException e) {
             log.warn("Error generating a symmetric key credential using algorithm URI: " + dataEncryptionAlgorithm, e);
             return null;
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
index 078adc8..208b5cc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
@@ -214,7 +214,7 @@ public class BasicSignatureSigningParametersResolver
      *          candidate signing method algorithm URIs
      */
     protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params, 
-            @Nonnull final CriteriaSet criteria, Predicate<String> whitelistBlacklistPredicate) {
+            @Nonnull final CriteriaSet criteria, final Predicate<String> whitelistBlacklistPredicate) {
         
         List<Credential> credentials = getEffectiveSigningCredentials(criteria);
         List<String> algorithms = getEffectiveSignatureAlgorithms(criteria, whitelistBlacklistPredicate);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
index a465cbe..c96325f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
@@ -114,7 +114,7 @@ public class BasicWhitelistBlacklistConfiguration implements WhitelistBlacklistC
      * 
      * @param flag true if should merge, false otherwise
      */
-    public void setWhitelistMerge(boolean flag) {
+    public void setWhitelistMerge(final boolean flag) {
         whitelistMerge = flag;
     }
 
@@ -157,7 +157,7 @@ public class BasicWhitelistBlacklistConfiguration implements WhitelistBlacklistC
      * 
      * @param flag true if should merge, false otherwise
      */
-    public void setBlacklistMerge(boolean flag) {
+    public void setBlacklistMerge(final boolean flag) {
         blacklistMerge = flag;
     }
 
@@ -171,7 +171,7 @@ public class BasicWhitelistBlacklistConfiguration implements WhitelistBlacklistC
      * 
      * @param value the precedence value
      */
-    public void setWhitelistBlacklistPrecedence(@Nonnull Precedence value) {
+    public void setWhitelistBlacklistPrecedence(@Nonnull final Precedence value) {
         precedence = Constraint.isNotNull(value, "Precedence may not be null");
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BlacklistPredicate.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BlacklistPredicate.java
index ffd43af..eb0fc39 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BlacklistPredicate.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BlacklistPredicate.java
@@ -43,14 +43,14 @@ public class BlacklistPredicate implements Predicate<String> {
      *
      * @param algorithms collection of blacklisted algorithms
      */
-    public BlacklistPredicate(@Nonnull Collection<String> algorithms) {
+    public BlacklistPredicate(@Nonnull final Collection<String> algorithms) {
         Constraint.isNotNull(algorithms, "Blacklist may not be null");
         blacklist = new HashSet<>();
         blacklist.addAll(Collections2.filter(algorithms, Predicates.notNull()));
     }
 
     /** {@inheritDoc} */
-    public boolean apply(@Nullable String input) {
+    public boolean apply(@Nullable final String input) {
         if (input == null) {
             throw new IllegalArgumentException("Algorithm URI to evaluate may not be null");
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticDecryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticDecryptionParametersResolver.java
index 79fcf19..b4d76f7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticDecryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticDecryptionParametersResolver.java
@@ -41,17 +41,17 @@ public class StaticDecryptionParametersResolver implements DecryptionParametersR
      *
      * @param parameters the static parameters instance to return
      */
-    public StaticDecryptionParametersResolver(DecryptionParameters parameters) {
+    public StaticDecryptionParametersResolver(final DecryptionParameters parameters) {
         params = Constraint.isNotNull(parameters, "Parameters instance may not be null");
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Iterable<DecryptionParameters> resolve(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<DecryptionParameters> resolve(final CriteriaSet criteria) throws ResolverException {
         return Collections.singleton(params);
     }
 
     /** {@inheritDoc} */
-    @Nonnull public DecryptionParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public DecryptionParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
         return params;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticEncryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticEncryptionParametersResolver.java
index 3024fec..f908c11 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticEncryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticEncryptionParametersResolver.java
@@ -41,17 +41,17 @@ public class StaticEncryptionParametersResolver implements EncryptionParametersR
      *
      * @param parameters the static parameters instance to return
      */
-    public StaticEncryptionParametersResolver(EncryptionParameters parameters) {
+    public StaticEncryptionParametersResolver(final EncryptionParameters parameters) {
         params = Constraint.isNotNull(parameters, "Parameters instance may not be null");
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Iterable<EncryptionParameters> resolve(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<EncryptionParameters> resolve(final CriteriaSet criteria) throws ResolverException {
         return Collections.singleton(params);
     }
 
     /** {@inheritDoc} */
-    @Nonnull public EncryptionParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public EncryptionParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
         return params;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureSigningParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureSigningParametersResolver.java
index b2da99c..7c6f7ad 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureSigningParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureSigningParametersResolver.java
@@ -41,17 +41,17 @@ public class StaticSignatureSigningParametersResolver implements SignatureSignin
      *
      * @param parameters the static parameters instance to return
      */
-    public StaticSignatureSigningParametersResolver(SignatureSigningParameters parameters) {
+    public StaticSignatureSigningParametersResolver(final SignatureSigningParameters parameters) {
         params = Constraint.isNotNull(parameters, "Parameters instance may not be null");
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Iterable<SignatureSigningParameters> resolve(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<SignatureSigningParameters> resolve(final CriteriaSet criteria) throws ResolverException {
         return Collections.singleton(params);
     }
 
     /** {@inheritDoc} */
-    @Nonnull public SignatureSigningParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public SignatureSigningParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
         return params;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureValidationParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureValidationParametersResolver.java
index 7c69741..0237830 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureValidationParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/StaticSignatureValidationParametersResolver.java
@@ -41,17 +41,18 @@ public class StaticSignatureValidationParametersResolver implements SignatureVal
      *
      * @param parameters the static parameters instance to return
      */
-    public StaticSignatureValidationParametersResolver(SignatureValidationParameters parameters) {
+    public StaticSignatureValidationParametersResolver(final SignatureValidationParameters parameters) {
         params = Constraint.isNotNull(parameters, "Parameters instance may not be null");
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Iterable<SignatureValidationParameters> resolve(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<SignatureValidationParameters> resolve(final CriteriaSet criteria)
+            throws ResolverException {
         return Collections.singleton(params);
     }
 
     /** {@inheritDoc} */
-    @Nonnull public SignatureValidationParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public SignatureValidationParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
         return params;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/WhitelistPredicate.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/WhitelistPredicate.java
index 4689d7f..11ecf19 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/WhitelistPredicate.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/WhitelistPredicate.java
@@ -44,14 +44,14 @@ public class WhitelistPredicate implements Predicate<String> {
      *
      * @param algorithms collection of whitelisted algorithms
      */
-    public WhitelistPredicate(@Nonnull Collection<String> algorithms) {
+    public WhitelistPredicate(@Nonnull final Collection<String> algorithms) {
         Constraint.isNotNull(algorithms, "Whitelist may not be null");
         whitelist = new HashSet<>();
         whitelist.addAll(Collections2.filter(algorithms, Predicates.notNull()));
     }
 
     /** {@inheritDoc} */
-    public boolean apply(@Nullable String input) {
+    public boolean apply(@Nullable final String input) {
         if (input == null) {
             throw new IllegalArgumentException("Algorithm URI to evaluate may not be null");
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
index fad04a3..a62684d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
@@ -89,7 +89,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value to set
      */
-    public void setEmitEntityIDAsKeyName(boolean newValue) {
+    public void setEmitEntityIDAsKeyName(final boolean newValue) {
         options.emitEntityIDAsKeyName = newValue;
     }
 
@@ -107,7 +107,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value to set
      */
-    public void setEmitKeyNames(boolean newValue) {
+    public void setEmitKeyNames(final boolean newValue) {
         options.emitKeyNames = newValue;
     }
 
@@ -125,7 +125,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value to set
      */
-    public void setEmitPublicKeyValue(boolean newValue) {
+    public void setEmitPublicKeyValue(final boolean newValue) {
         options.emitPublicKeyValue = newValue;
     }
     
@@ -143,7 +143,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
      *
      * @param newValue the new option value to set
      */
-    public void setEmitPublicDEREncodedKeyValue(boolean newValue) {
+    public void setEmitPublicDEREncodedKeyValue(final boolean newValue) {
         options.emitPublicDEREncodedKeyValue = newValue;
     }
     
@@ -255,9 +255,9 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
                 if (options.emitPublicDEREncodedKeyValue) {
                     try {
                         KeyInfoSupport.addDEREncodedPublicKey(keyInfo, credential.getPublicKey());
-                    } catch (NoSuchAlgorithmException e) {
+                    } catch (final NoSuchAlgorithmException e) {
                         throw new SecurityException("Can't DER-encode key, unsupported key algorithm", e);
-                    } catch (InvalidKeySpecException e) {
+                    } catch (final InvalidKeySpecException e) {
                         throw new SecurityException("Can't DER-encode key, invalid key specification", e);
                     }
                 }
@@ -286,7 +286,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
         protected BasicOptions clone() {
             try {
                 return (BasicOptions) super.clone();
-            } catch (CloneNotSupportedException e) {
+            } catch (final CloneNotSupportedException e) {
                 // we know we're cloneable, so this will never happen
                 return null;
             }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
index 858086f..7221f4f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
@@ -318,7 +318,7 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
             Collection<Credential> creds;
             try {
                 creds = provider.process(this, keyInfoChild, criteriaSet, kiContext);
-            } catch (SecurityException e) {
+            } catch (final SecurityException e) {
                 throw new ResolverException("Error processing KeyInfo child element", e);
             }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
index 60e722b..1015151 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
@@ -108,7 +108,7 @@ public class StaticKeyInfoGenerator implements KeyInfoGenerator {
         if (origDOM == null) {
             try {
                 getMarshaller().marshall(origKeyInfo);
-            } catch (MarshallingException e) {
+            } catch (final MarshallingException e) {
                 throw new SecurityException("Error marshalling the original KeyInfo during cloning", e);
             }
         }
@@ -116,7 +116,7 @@ public class StaticKeyInfoGenerator implements KeyInfoGenerator {
         KeyInfo newKeyInfo = null;
         try {
             newKeyInfo = (KeyInfo) getUnmarshaller().unmarshall(origKeyInfo.getDOM());
-        } catch (UnmarshallingException e) {
+        } catch (final UnmarshallingException e) {
             throw new SecurityException("Error unmarshalling the new KeyInfo during cloning", e);
         }
         
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
index 6d86bd7..58a34d3 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
@@ -101,7 +101,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitCRLs(boolean newValue) {
+    public void setEmitCRLs(final boolean newValue) {
         options.emitCRLs = newValue;
     }
 
@@ -119,7 +119,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      *
      * @param newValue the new option value
      */
-    public void setEmitEntityCertificate(boolean newValue) {
+    public void setEmitEntityCertificate(final boolean newValue) {
         options.emitEntityCertificate = newValue;
     }
 
@@ -137,7 +137,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitEntityCertificateChain(boolean newValue) {
+    public void setEmitEntityCertificateChain(final boolean newValue) {
         options.emitEntityCertificateChain = newValue;
     }
 
@@ -155,7 +155,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitSubjectAltNamesAsKeyNames(boolean newValue) {
+    public void setEmitSubjectAltNamesAsKeyNames(final boolean newValue) {
         options.emitSubjectAltNamesAsKeyNames = newValue;
     }
 
@@ -173,7 +173,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitSubjectCNAsKeyName(boolean newValue) {
+    public void setEmitSubjectCNAsKeyName(final boolean newValue) {
         options.emitSubjectCNAsKeyName = newValue;
     }
 
@@ -191,7 +191,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitSubjectDNAsKeyName(boolean newValue) {
+    public void setEmitSubjectDNAsKeyName(final boolean newValue) {
         options.emitSubjectDNAsKeyName = newValue;
     }
 
@@ -211,7 +211,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitX509IssuerSerial(boolean newValue) {
+    public void setEmitX509IssuerSerial(final boolean newValue) {
         options.emitX509IssuerSerial = newValue;
     }
 
@@ -229,7 +229,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitX509SKI(boolean newValue) {
+    public void setEmitX509SKI(final boolean newValue) {
         options.emitX509SKI = newValue;
     }
 
@@ -247,7 +247,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitX509Digest(boolean newValue) {
+    public void setEmitX509Digest(final boolean newValue) {
         options.emitX509Digest = newValue;
     }
 
@@ -287,7 +287,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
      * 
      * @param newValue the new option value
      */
-    public void setEmitX509SubjectName(boolean newValue) {
+    public void setEmitX509SubjectName(final boolean newValue) {
         options.emitX509SubjectName = newValue;
     }
 
@@ -407,7 +407,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
          * 
          * @param newOptions the options to be used by the generator
          */
-        protected X509KeyInfoGenerator(X509Options newOptions) {
+        protected X509KeyInfoGenerator(final X509Options newOptions) {
             super(newOptions);
             options = newOptions;
             
@@ -476,7 +476,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
                 try {
                     X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
                     x509Data.getX509Certificates().add(xmlCert);
-                } catch (CertificateEncodingException e) {
+                } catch (final CertificateEncodingException e) {
                     throw new SecurityException("Error generating X509Certificate element " 
                             + "from credential's end-entity certificate", e);
                 }
@@ -576,9 +576,9 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
             if (options.emitX509Digest) {
                 try {
                     x509Data.getX509Digests().add(KeyInfoSupport.buildX509Digest(cert, options.x509DigestAlgorithmURI));
-                } catch (CertificateEncodingException e) {
+                } catch (final CertificateEncodingException e) {
                     throw new SecurityException("Can't digest certificate, certificate encoding error", e);
-                } catch (NoSuchAlgorithmException e) {
+                } catch (final NoSuchAlgorithmException e) {
                     throw new SecurityException("Can't digest certificate, unsupported digest algorithm", e);
                 }
             }
@@ -701,7 +701,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
                     try {
                         X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
                         x509Data.getX509Certificates().add(xmlCert);
-                    } catch (CertificateEncodingException e) {
+                    } catch (final CertificateEncodingException e) {
                         throw new SecurityException("Error generating X509Certificate element " 
                                 + "from a certificate in credential's certificate chain", e);
                     }
@@ -724,7 +724,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
                     try {
                         X509CRL xmlCRL = KeyInfoSupport.buildX509CRL(javaCRL);
                         x509Data.getX509CRLs().add(xmlCRL);
-                    } catch (CRLException e) {
+                    } catch (final CRLException e) {
                         throw new SecurityException("Error generating X509CRL element " 
                                 + "from a CRL in credential's CRL list", e);
                     }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
index 8418270..ee5171b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
@@ -68,7 +68,7 @@ public class DEREncodedKeyValueProvider extends AbstractKeyInfoProvider {
         PublicKey pubKey = null;
         try {
             pubKey = KeyInfoSupport.getKey(keyValue);
-        } catch (KeyException e) {
+        } catch (final KeyException e) {
             log.error("Error extracting DER-encoded key value", e);
             throw new SecurityException("Error extracting DER-encoded key value", e);
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
index 74a672d..844fa56 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
@@ -80,7 +80,7 @@ public class DSAKeyValueProvider extends AbstractKeyInfoProvider {
         try {
             //TODO deal with case of incomplete DSAParams, need hook to resolve those
             pubKey = KeyInfoSupport.getDSAKey(keyValue);
-        } catch (KeyException e) {
+        } catch (final KeyException e) {
             log.error("Error extracting DSA key value", e);
             throw new SecurityException("Error extracting DSA key value", e);
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
index a170346..3a8a470 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
@@ -99,7 +99,7 @@ public class KeyInfoReferenceProvider extends AbstractKeyInfoProvider {
                 }
                 return result;
             }
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             log.error("Exception while resolving credentials from KeyInfoReference referent", e);
         }
         
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
index f3cc322..d0ec5c1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
@@ -78,7 +78,7 @@ public class RSAKeyValueProvider extends AbstractKeyInfoProvider {
         PublicKey pubKey = null;
         try {
             pubKey = KeyInfoSupport.getRSAKey(keyValue);
-        } catch (KeyException e) {
+        } catch (final KeyException e) {
             log.error("Error extracting RSA key value", e);
             throw new SecurityException("Error extracting RSA key value", e);
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryBuilder.java
index a6d91c5..da48c18 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryBuilder.java
@@ -35,7 +35,7 @@ public class CryptoBinaryBuilder extends AbstractXMLObjectBuilder<CryptoBinary>
     }
 
     /** {@inheritDoc} */
-    public CryptoBinary buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CryptoBinary buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new CryptoBinaryImpl(namespaceURI, localName, namespacePrefix);
     }
     
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryImpl.java
index f13ae34..152d969 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryImpl.java
@@ -41,7 +41,7 @@ public class CryptoBinaryImpl extends XSBase64BinaryImpl implements CryptoBinary
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected CryptoBinaryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected CryptoBinaryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -56,7 +56,7 @@ public class CryptoBinaryImpl extends XSBase64BinaryImpl implements CryptoBinary
 
     /** {@inheritDoc} */
     @Override
-    public void setValueBigInt(BigInteger bigInt) {
+    public void setValueBigInt(final BigInteger bigInt) {
         if (bigInt == null) {
             setValue(null);
         } else {
@@ -67,7 +67,7 @@ public class CryptoBinaryImpl extends XSBase64BinaryImpl implements CryptoBinary
     
     /** {@inheritDoc} */
     @Override
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         if (bigIntValue != null 
                 && (!Objects.equals(getValue(), newValue) || newValue == null)) {
             // Just clear the cached value, my not be needed in big int form again,
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueBuilder.java
index 5414960..fe4b505 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueBuilder.java
@@ -35,7 +35,8 @@ public class DEREncodedKeyValueBuilder extends AbstractXMLObjectBuilder<DEREncod
     }
 
     /** {@inheritDoc} */
-    public DEREncodedKeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DEREncodedKeyValue buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new DEREncodedKeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
index aafdf16..14d698f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
@@ -35,7 +35,8 @@ public class DEREncodedKeyValueImpl extends XSBase64BinaryImpl implements DEREnc
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DEREncodedKeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DEREncodedKeyValueImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -45,7 +46,7 @@ public class DEREncodedKeyValueImpl extends XSBase64BinaryImpl implements DEREnc
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
index 0831445..093ddbd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class DEREncodedKeyValueMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
 
         if (der.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
index c0961a9..250c42f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class DEREncodedKeyValueUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
 
         if (attribute.getLocalName().equals(DEREncodedKeyValue.ID_ATTRIB_NAME)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueBuilder.java
index ea3b7f6..7a56569 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueBuilder.java
@@ -35,7 +35,7 @@ public class DSAKeyValueBuilder extends AbstractXMLObjectBuilder<DSAKeyValue> im
     }
 
     /** {@inheritDoc} */
-    public DSAKeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DSAKeyValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DSAKeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
index a55780e..820f6d3 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
@@ -65,7 +65,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DSAKeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DSAKeyValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -75,7 +75,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setP(P newP) {
+    public void setP(final P newP) {
         this.p = prepareForAssignment(this.p, newP);
     }
 
@@ -85,7 +85,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setQ(Q newQ) {
+    public void setQ(final Q newQ) {
         this.q = prepareForAssignment(this.q, newQ);
     }
 
@@ -95,7 +95,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setG(G newG) {
+    public void setG(final G newG) {
         this.g = prepareForAssignment(this.g, newG);
     }
 
@@ -105,7 +105,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setY(Y newY) {
+    public void setY(final Y newY) {
         this.y = prepareForAssignment(this.y, newY);
     }
 
@@ -115,7 +115,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setJ(J newJ) {
+    public void setJ(final J newJ) {
         this.j = prepareForAssignment(this.j, newJ);
     }
 
@@ -125,7 +125,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setSeed(Seed newSeed) {
+    public void setSeed(final Seed newSeed) {
         this.seed = prepareForAssignment(this.seed, newSeed);
     }
 
@@ -135,7 +135,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setPgenCounter(PgenCounter newPgenCounter) {
+    public void setPgenCounter(final PgenCounter newPgenCounter) {
         this.pgenCounter = prepareForAssignment(this.pgenCounter, newPgenCounter);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
index 661fe7c..17738bd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
@@ -34,7 +34,7 @@ import org.opensaml.xmlsec.signature.Y;
 public class DSAKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         DSAKeyValue keyValue = (DSAKeyValue) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodBuilder.java
index 4591fca..322a0b6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodBuilder.java
@@ -36,7 +36,7 @@ public class DigestMethodBuilder extends AbstractXMLObjectBuilder<DigestMethod>
     }
 
     /** {@inheritDoc} */
-    public DigestMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DigestMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DigestMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
index 7017957..ef348d5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
@@ -46,7 +46,7 @@ public class DigestMethodImpl extends AbstractXMLObject implements DigestMethod
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DigestMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DigestMethodImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -58,7 +58,7 @@ public class DigestMethodImpl extends AbstractXMLObject implements DigestMethod
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         this.algorithm = prepareForAssignment(this.algorithm, newAlgorithm);
     }
 
@@ -67,7 +67,7 @@ public class DigestMethodImpl extends AbstractXMLObject implements DigestMethod
         return this.unknownChildren;
     }
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
index 9d19fd1..1cdaf1c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class DigestMethodMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         DigestMethod dm = (DigestMethod) xmlObject;
 
         if (dm.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
index 2fc278a..c663c99 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class DigestMethodUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         DigestMethod dm = (DigestMethod) xmlObject;
 
         if (attribute.getLocalName().equals(DigestMethod.ALGORITHM_ATTRIB_NAME)) {
@@ -39,7 +39,7 @@ public class DigestMethodUnmarshaller extends AbstractXMLSignatureUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         DigestMethod dm = (DigestMethod) parentXMLObject;
         dm.getUnknownXMLObjects().add(childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueBuilder.java
index 09b0448..c70b876 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueBuilder.java
@@ -35,7 +35,7 @@ public class ECKeyValueBuilder extends AbstractXMLObjectBuilder<ECKeyValue>
     }
 
     /** {@inheritDoc} */
-    public ECKeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ECKeyValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ECKeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
index 1367a62..914d1b3 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
@@ -51,7 +51,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ECKeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ECKeyValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -61,7 +61,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
@@ -73,7 +73,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setECParameters(XMLObject newParams) {
+    public void setECParameters(final XMLObject newParams) {
         ecParams = prepareForAssignment(ecParams, newParams);
     }
     
@@ -83,7 +83,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setNamedCurve(NamedCurve newCurve) {
+    public void setNamedCurve(final NamedCurve newCurve) {
         namedCurve = prepareForAssignment(namedCurve, newCurve);
     }
 
@@ -93,7 +93,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setPublicKey(PublicKey newKey) {
+    public void setPublicKey(final PublicKey newKey) {
         publicKey = prepareForAssignment(publicKey, newKey);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
index 57d3a15..b3f2e80 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class ECKeyValueMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ECKeyValue ec = (ECKeyValue) xmlObject;
 
         if (ec.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
index 7c6a76d..cea822c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
@@ -37,7 +37,7 @@ public class ECKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
     public static final QName ECPARAMETERS_ELEMENT_NAME = new QName(SignatureConstants.XMLSIG11_NS, "ECParameters");
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         ECKeyValue ec = (ECKeyValue) xmlObject;
 
         if (attribute.getLocalName().equals(ECKeyValue.ID_ATTRIB_NAME)) {
@@ -49,7 +49,7 @@ public class ECKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
     }
     
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ECKeyValue keyValue = (ECKeyValue) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECPointTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECPointTypeImpl.java
index e1b4774..30ec569 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECPointTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECPointTypeImpl.java
@@ -31,7 +31,7 @@ public class ECPointTypeImpl extends CryptoBinaryImpl implements ECPointType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ECPointTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ECPointTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentBuilder.java
index ad18971..0ecc0a5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentBuilder.java
@@ -34,7 +34,7 @@ public class ExponentBuilder extends AbstractXMLObjectBuilder<Exponent> implemen
     }
 
     /** {@inheritDoc} */
-    public Exponent buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Exponent buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ExponentImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentImpl.java
index b4a4f23..bf4e03b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ExponentImpl.java
@@ -31,7 +31,7 @@ public class ExponentImpl extends CryptoBinaryImpl implements Exponent {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ExponentImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ExponentImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GBuilder.java
index 3fb7f48..71f4041 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GBuilder.java
@@ -34,7 +34,7 @@ public class GBuilder extends AbstractXMLObjectBuilder<G> implements XMLSignatur
     }
 
     /** {@inheritDoc} */
-    public G buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public G buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GImpl.java
index 2ff8181..c90bb23 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/GImpl.java
@@ -31,7 +31,7 @@ public class GImpl extends CryptoBinaryImpl implements G {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected GImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JBuilder.java
index cf12deb..148edb8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JBuilder.java
@@ -34,7 +34,7 @@ public class JBuilder extends AbstractXMLObjectBuilder<J> implements XMLSignatur
     }
 
     /** {@inheritDoc} */
-    public J buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public J buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new JImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JImpl.java
index 3f262ee..72f1794 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/JImpl.java
@@ -31,7 +31,7 @@ public class JImpl extends CryptoBinaryImpl implements J {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected JImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected JImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoBuilder.java
index 728d6ab..a5fbf0f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoBuilder.java
@@ -34,7 +34,7 @@ public class KeyInfoBuilder extends AbstractXMLObjectBuilder<KeyInfo> implements
     }
 
     /** {@inheritDoc} */
-    public KeyInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyInfo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
index 9fb1507..c09e001 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
@@ -57,7 +57,7 @@ public class KeyInfoImpl extends AbstractXMLObject implements KeyInfo {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyInfoImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList(this);
     }
@@ -68,7 +68,7 @@ public class KeyInfoImpl extends AbstractXMLObject implements KeyInfo {
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -80,7 +80,7 @@ public class KeyInfoImpl extends AbstractXMLObject implements KeyInfo {
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) indexedChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
index b7aec88..8207c6f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class KeyInfoMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         KeyInfo keyInfo = (KeyInfo ) xmlObject;
 
         if (keyInfo.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceBuilder.java
index 14b9279..407936c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceBuilder.java
@@ -35,7 +35,8 @@ public class KeyInfoReferenceBuilder extends AbstractXMLObjectBuilder<KeyInfoRef
     }
 
     /** {@inheritDoc} */
-    public KeyInfoReference buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyInfoReference buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new KeyInfoReferenceImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
index bb1e43d..6a4cf9b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
@@ -41,7 +41,8 @@ public class KeyInfoReferenceImpl extends AbstractXMLObject implements KeyInfoRe
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyInfoReferenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyInfoReferenceImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +52,7 @@ public class KeyInfoReferenceImpl extends AbstractXMLObject implements KeyInfoRe
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
@@ -63,7 +64,7 @@ public class KeyInfoReferenceImpl extends AbstractXMLObject implements KeyInfoRe
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         uri = prepareForAssignment(uri, newURI);
     }
     
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
index 49be132..5002778 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class KeyInfoReferenceMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         KeyInfoReference ref = (KeyInfoReference) xmlObject;
 
         if (ref.getID() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
index 1bee047..ab6b8e1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class KeyInfoReferenceUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         KeyInfoReference ref = (KeyInfoReference) xmlObject;
 
         if (attribute.getLocalName().equals(KeyInfoReference.ID_ATTRIB_NAME)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
index 4dcddc1..e9dd56c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class KeyInfoUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         KeyInfo keyInfo = (KeyInfo) xmlObject;
 
         if (attribute.getLocalName().equals(KeyInfo.ID_ATTRIB_NAME)) {
@@ -40,7 +40,7 @@ public class KeyInfoUnmarshaller extends AbstractXMLSignatureUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         KeyInfo keyInfo = (KeyInfo) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameBuilder.java
index 5ef275a..6fd298b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameBuilder.java
@@ -34,7 +34,7 @@ public class KeyNameBuilder extends AbstractXMLObjectBuilder<KeyName> implements
     }
 
     /** {@inheritDoc} */
-    public KeyName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyNameImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameImpl.java
index 352a8ae..f5ba9bd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyNameImpl.java
@@ -32,7 +32,7 @@ public class KeyNameImpl extends XSStringImpl implements KeyName {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueBuilder.java
index 23d810a..cbec830 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueBuilder.java
@@ -34,7 +34,7 @@ public class KeyValueBuilder extends AbstractXMLObjectBuilder<KeyValue> implemen
     }
 
     /** {@inheritDoc} */
-    public KeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
index eb13b0e..0112604 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
@@ -52,7 +52,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -62,7 +62,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setDSAKeyValue(DSAKeyValue newDSAKeyValue) {
+    public void setDSAKeyValue(final DSAKeyValue newDSAKeyValue) {
         dsaKeyValue = prepareForAssignment(dsaKeyValue, newDSAKeyValue);
     }
 
@@ -72,7 +72,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setRSAKeyValue(RSAKeyValue newRSAKeyValue) {
+    public void setRSAKeyValue(final RSAKeyValue newRSAKeyValue) {
         rsaKeyValue = prepareForAssignment(rsaKeyValue, newRSAKeyValue);
     }
 
@@ -82,7 +82,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setECKeyValue(ECKeyValue newECKeyValue) {
+    public void setECKeyValue(final ECKeyValue newECKeyValue) {
         ecKeyValue = prepareForAssignment(ecKeyValue, newECKeyValue);
     }
     
@@ -92,7 +92,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setUnknownXMLObject(XMLObject newXMLObject) {
+    public void setUnknownXMLObject(final XMLObject newXMLObject) {
         unknownXMLObject = prepareForAssignment(unknownXMLObject, newXMLObject);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
index 572bd86..0ef426a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.xmlsec.signature.RSAKeyValue;
 public class KeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         KeyValue keyValue = (KeyValue) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataBuilder.java
index d060c2e..5f4a724 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataBuilder.java
@@ -34,7 +34,7 @@ public class MgmtDataBuilder extends AbstractXMLObjectBuilder<MgmtData> implemen
     }
 
     /** {@inheritDoc} */
-    public MgmtData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public MgmtData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new MgmtDataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataImpl.java
index bcb4631..5dfbda7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/MgmtDataImpl.java
@@ -32,7 +32,7 @@ public class MgmtDataImpl extends XSStringImpl implements MgmtData {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected MgmtDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected MgmtDataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusBuilder.java
index d7b59ef..528aec2 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusBuilder.java
@@ -34,7 +34,7 @@ public class ModulusBuilder extends AbstractXMLObjectBuilder<Modulus> implements
     }
 
     /** {@inheritDoc} */
-    public Modulus buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Modulus buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ModulusImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusImpl.java
index 6a2eb16..1695feb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ModulusImpl.java
@@ -31,7 +31,7 @@ public class ModulusImpl extends CryptoBinaryImpl implements Modulus {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ModulusImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ModulusImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveBuilder.java
index 7068664..0253aed 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveBuilder.java
@@ -35,7 +35,7 @@ public class NamedCurveBuilder extends AbstractXMLObjectBuilder<NamedCurve>
     }
 
     /** {@inheritDoc} */
-    public NamedCurve buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NamedCurve buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NamedCurveImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveImpl.java
index aab3869..06fabec 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveImpl.java
@@ -38,7 +38,7 @@ public class NamedCurveImpl extends AbstractXMLObject implements NamedCurve {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NamedCurveImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NamedCurveImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -48,7 +48,7 @@ public class NamedCurveImpl extends AbstractXMLObject implements NamedCurve {
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         uri = prepareForAssignment(uri, newURI);
     }
     
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
index f04b2df..8a7ad1e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class NamedCurveMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         NamedCurve nc = (NamedCurve) xmlObject;
 
         if (nc.getURI() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
index f27ea2b..e964777 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class NamedCurveUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         NamedCurve nc = (NamedCurve) xmlObject;
 
         if (attribute.getLocalName().equals(NamedCurve.URI_ATTRIB_NAME)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PBuilder.java
index 973c0a4..281fc3d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PBuilder.java
@@ -34,7 +34,7 @@ public class PBuilder extends AbstractXMLObjectBuilder<P> implements XMLSignatur
     }
 
     /** {@inheritDoc} */
-    public P buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public P buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataBuilder.java
index 1766965..2a5ee3b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataBuilder.java
@@ -34,7 +34,7 @@ public class PGPDataBuilder extends AbstractXMLObjectBuilder<PGPData> implements
     }
 
     /** {@inheritDoc} */
-    public PGPData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PGPData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PGPDataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
index ee32b19..114bb37 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
@@ -51,7 +51,7 @@ public class PGPDataImpl extends AbstractXMLObject implements PGPData {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PGPDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PGPDataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         xmlChildren = new IndexedXMLObjectChildrenList(this);
     }
@@ -62,7 +62,7 @@ public class PGPDataImpl extends AbstractXMLObject implements PGPData {
     }
 
     /** {@inheritDoc} */
-    public void setPGPKeyID(PGPKeyID newPGPKeyID) {
+    public void setPGPKeyID(final PGPKeyID newPGPKeyID) {
         this.pgpKeyID = prepareForAssignment(this.pgpKeyID, newPGPKeyID);
     }
 
@@ -72,7 +72,7 @@ public class PGPDataImpl extends AbstractXMLObject implements PGPData {
     }
 
     /** {@inheritDoc} */
-    public void setPGPKeyPacket(PGPKeyPacket newPGPKeyPacket) {
+    public void setPGPKeyPacket(final PGPKeyPacket newPGPKeyPacket) {
         this.pgpKeyPacket = prepareForAssignment(this.pgpKeyPacket, newPGPKeyPacket);
     }
 
@@ -81,7 +81,7 @@ public class PGPDataImpl extends AbstractXMLObject implements PGPData {
         return (List<XMLObject>) xmlChildren;
     }
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) xmlChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
index 2fe02b8..b45c21c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.xmlsec.signature.PGPKeyPacket;
 public class PGPDataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         PGPData pgpData = (PGPData) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDBuilder.java
index d3d76a0..6730133 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDBuilder.java
@@ -34,7 +34,7 @@ public class PGPKeyIDBuilder extends AbstractXMLObjectBuilder<PGPKeyID> implemen
     }
 
     /** {@inheritDoc} */
-    public PGPKeyID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PGPKeyID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PGPKeyIDImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDImpl.java
index 55659b7..345eba8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDImpl.java
@@ -32,7 +32,7 @@ public class PGPKeyIDImpl extends XSBase64BinaryImpl implements PGPKeyID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PGPKeyIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PGPKeyIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketBuilder.java
index f36cc07..b4cb25e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketBuilder.java
@@ -35,7 +35,7 @@ public class PGPKeyPacketBuilder extends AbstractXMLObjectBuilder<PGPKeyPacket>
     }
 
     /** {@inheritDoc} */
-    public PGPKeyPacket buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PGPKeyPacket buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PGPKeyPacketImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketImpl.java
index deb353e..f927431 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketImpl.java
@@ -32,7 +32,7 @@ public class PGPKeyPacketImpl extends XSBase64BinaryImpl implements PGPKeyPacket
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PGPKeyPacketImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PGPKeyPacketImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PImpl.java
index 0d3e892..4dc8ef7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PImpl.java
@@ -31,7 +31,7 @@ public class PImpl extends CryptoBinaryImpl implements P {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterBuilder.java
index 34a593d..779cfd5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterBuilder.java
@@ -35,7 +35,7 @@ public class PgenCounterBuilder extends AbstractXMLObjectBuilder<PgenCounter> im
     }
 
     /** {@inheritDoc} */
-    public PgenCounter buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PgenCounter buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PgenCounterImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterImpl.java
index 5f748d6..331cb42 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PgenCounterImpl.java
@@ -31,7 +31,7 @@ public class PgenCounterImpl extends CryptoBinaryImpl implements PgenCounter {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PgenCounterImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PgenCounterImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyBuilder.java
index 5e8c1ff..90c8bb7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyBuilder.java
@@ -35,7 +35,7 @@ public class PublicKeyBuilder extends AbstractXMLObjectBuilder<PublicKey>
     }
 
     /** {@inheritDoc} */
-    public PublicKey buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PublicKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PublicKeyImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyImpl.java
index cecf6d9..3ddbf03 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PublicKeyImpl.java
@@ -31,7 +31,7 @@ public class PublicKeyImpl extends ECPointTypeImpl implements PublicKey {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PublicKeyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PublicKeyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QBuilder.java
index cc68e95..05bc47a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QBuilder.java
@@ -34,7 +34,7 @@ public class QBuilder extends AbstractXMLObjectBuilder<Q> implements XMLSignatur
     }
 
     /** {@inheritDoc} */
-    public Q buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Q buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new QImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QImpl.java
index e885369..3d67e8b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/QImpl.java
@@ -31,7 +31,7 @@ public class QImpl extends CryptoBinaryImpl implements Q {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected QImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected QImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueBuilder.java
index 1b021f8..05ba857 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueBuilder.java
@@ -35,7 +35,7 @@ public class RSAKeyValueBuilder extends AbstractXMLObjectBuilder<RSAKeyValue> im
     }
 
     /** {@inheritDoc} */
-    public RSAKeyValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RSAKeyValue buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RSAKeyValueImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
index 37a5609..6c69308 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
@@ -45,7 +45,7 @@ public class RSAKeyValueImpl extends AbstractXMLObject implements RSAKeyValue {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RSAKeyValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RSAKeyValueImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class RSAKeyValueImpl extends AbstractXMLObject implements RSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setModulus(Modulus newModulus) {
+    public void setModulus(final Modulus newModulus) {
         this.modulus = prepareForAssignment(this.modulus, newModulus);
     }
 
@@ -65,7 +65,7 @@ public class RSAKeyValueImpl extends AbstractXMLObject implements RSAKeyValue {
     }
 
     /** {@inheritDoc} */
-    public void setExponent(Exponent newExponent) {
+    public void setExponent(final Exponent newExponent) {
         this.exponent = prepareForAssignment(this.exponent, newExponent);
 
     }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
index 1b02fd3..7813365 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.xmlsec.signature.RSAKeyValue;
 public class RSAKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         RSAKeyValue keyValue = (RSAKeyValue) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodBuilder.java
index 8d08e47..8199392 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodBuilder.java
@@ -35,7 +35,8 @@ public class RetrievalMethodBuilder extends AbstractXMLObjectBuilder<RetrievalMe
     }
 
     /** {@inheritDoc} */
-    public RetrievalMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RetrievalMethod buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new RetrievalMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
index 485a9e8..4a1fa75 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
@@ -47,7 +47,8 @@ public class RetrievalMethodImpl extends AbstractXMLObject implements RetrievalM
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RetrievalMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RetrievalMethodImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +58,7 @@ public class RetrievalMethodImpl extends AbstractXMLObject implements RetrievalM
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         this.uri = prepareForAssignment(this.uri, newURI);
     }
 
@@ -67,7 +68,7 @@ public class RetrievalMethodImpl extends AbstractXMLObject implements RetrievalM
     }
 
     /** {@inheritDoc} */
-    public void setType(String newType) {
+    public void setType(final String newType) {
         this.type = prepareForAssignment(this.type, newType);
     }
 
@@ -77,7 +78,7 @@ public class RetrievalMethodImpl extends AbstractXMLObject implements RetrievalM
     }
 
     /** {@inheritDoc} */
-    public void setTransforms(Transforms newTransforms) {
+    public void setTransforms(final Transforms newTransforms) {
         this.transforms = prepareForAssignment(this.transforms, newTransforms);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
index 6afd08f..0ead9df 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class RetrievalMethodMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         RetrievalMethod rm = (RetrievalMethod) xmlObject;
 
         if (rm.getURI() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
index 0c462ab..24ab455 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class RetrievalMethodUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         RetrievalMethod rm = (RetrievalMethod) xmlObject;
 
         if (attribute.getLocalName().equals(RetrievalMethod.URI_ATTRIB_NAME)) {
@@ -42,7 +42,7 @@ public class RetrievalMethodUnmarshaller extends AbstractXMLSignatureUnmarshalle
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         RetrievalMethod rm = (RetrievalMethod) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataBuilder.java
index 2f7d5ad..836cb93 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataBuilder.java
@@ -34,7 +34,7 @@ public class SPKIDataBuilder extends AbstractXMLObjectBuilder<SPKIData> implemen
     }
 
     /** {@inheritDoc} */
-    public SPKIData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SPKIData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SPKIDataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
index 384aa06..e0dfd87 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
@@ -44,7 +44,7 @@ public class SPKIDataImpl extends AbstractXMLObject implements SPKIData {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SPKIDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SPKIDataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList(this);
     }
@@ -55,7 +55,7 @@ public class SPKIDataImpl extends AbstractXMLObject implements SPKIData {
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) this.indexedChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
index 791b869..8bd8a11 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.xmlsec.signature.SPKIData;
 public class SPKIDataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         SPKIData spkiData = (SPKIData) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpBuilder.java
index 7887d1a..c58d67a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpBuilder.java
@@ -34,7 +34,7 @@ public class SPKISexpBuilder extends AbstractXMLObjectBuilder<SPKISexp> implemen
     }
 
     /** {@inheritDoc} */
-    public SPKISexp buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SPKISexp buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SPKISexpImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpImpl.java
index bcba3c2..3ef487d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKISexpImpl.java
@@ -32,7 +32,7 @@ public class SPKISexpImpl extends XSBase64BinaryImpl implements SPKISexp {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SPKISexpImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SPKISexpImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedBuilder.java
index d004cb2..12f9908 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedBuilder.java
@@ -34,7 +34,7 @@ public class SeedBuilder extends AbstractXMLObjectBuilder<Seed> implements XMLSi
     }
 
     /** {@inheritDoc} */
-    public Seed buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Seed buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SeedImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedImpl.java
index b49c8af..f2058a1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SeedImpl.java
@@ -31,7 +31,7 @@ public class SeedImpl extends CryptoBinaryImpl implements Seed {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SeedImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SeedImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureBuilder.java
index 71a293e..4920a8b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureBuilder.java
@@ -43,7 +43,7 @@ public class SignatureBuilder extends AbstractXMLObjectBuilder<SignatureImpl> {
     }
 
     /** {@inheritDoc} */
-    public SignatureImpl buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SignatureImpl buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SignatureImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureImpl.java
index c89ea62..d770e9a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureImpl.java
@@ -62,7 +62,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SignatureImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SignatureImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         contentReferences = new LinkedList<>();
     }
@@ -73,7 +73,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
     }
 
     /** {@inheritDoc} */
-    public void setCanonicalizationAlgorithm(String newAlgorithm) {
+    public void setCanonicalizationAlgorithm(final String newAlgorithm) {
         canonicalizationAlgorithm = prepareForAssignment(canonicalizationAlgorithm, newAlgorithm);
     }
 
@@ -83,7 +83,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
     }
 
     /** {@inheritDoc} */
-    public void setSignatureAlgorithm(String newAlgorithm) {
+    public void setSignatureAlgorithm(final String newAlgorithm) {
         signatureAlgorithm = prepareForAssignment(signatureAlgorithm, newAlgorithm);
     }
 
@@ -93,7 +93,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
     }
 
     /** {@inheritDoc} */
-    public void setHMACOutputLength(Integer length) {
+    public void setHMACOutputLength(final Integer length) {
         hmacOutputLength = prepareForAssignment(hmacOutputLength, length);
     }
 
@@ -103,7 +103,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
     }
 
     /** {@inheritDoc} */
-    public void setSigningCredential(Credential newCredential) {
+    public void setSigningCredential(final Credential newCredential) {
         signingCredential = prepareForAssignment(signingCredential, newCredential);
     }
 
@@ -113,7 +113,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
     }
 
     /** {@inheritDoc} */
-    public void setKeyInfo(KeyInfo newKeyInfo) {
+    public void setKeyInfo(final KeyInfo newKeyInfo) {
         keyInfo = prepareForAssignment(keyInfo, newKeyInfo);
     }
 
@@ -158,7 +158,7 @@ public class SignatureImpl extends AbstractXMLObject implements Signature {
      * 
      * @param signature an Apache XML Security signature object
      */
-    public void setXMLSignature(XMLSignature signature) {
+    public void setXMLSignature(final XMLSignature signature) {
         xmlSignature = prepareForAssignment(xmlSignature, signature);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
index 80c36a4..0705ddb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
@@ -57,24 +57,24 @@ public class SignatureMarshaller implements Marshaller {
     }
 
     /** {@inheritDoc} */
-    public Element marshall(XMLObject xmlObject) throws MarshallingException {
+    public Element marshall(final XMLObject xmlObject) throws MarshallingException {
         try {
             Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
             return marshall(xmlObject, document);
-        } catch (ParserConfigurationException e) {
+        } catch (final ParserConfigurationException e) {
             throw new MarshallingException("Unable to create Document to place marshalled elements in", e);
         }
     }
 
     /** {@inheritDoc} */
-    public Element marshall(XMLObject xmlObject, Element parentElement) throws MarshallingException {
+    public Element marshall(final XMLObject xmlObject, final Element parentElement) throws MarshallingException {
         Element signatureElement = createSignatureElement((SignatureImpl) xmlObject, parentElement.getOwnerDocument());
         ElementSupport.appendChildElement(parentElement, signatureElement);
         return signatureElement;
     }
 
     /** {@inheritDoc} */
-    public Element marshall(XMLObject xmlObject, Document document) throws MarshallingException {
+    public Element marshall(final XMLObject xmlObject, final Document document) throws MarshallingException {
         Element signatureElement = createSignatureElement((SignatureImpl) xmlObject, document);
 
         Element documentRoot = document.getDocumentElement();
@@ -97,7 +97,8 @@ public class SignatureMarshaller implements Marshaller {
      * 
      * @throws MarshallingException thrown if the signature can not be constructed
      */
-    private Element createSignatureElement(Signature signature, Document document) throws MarshallingException {
+    private Element createSignatureElement(final Signature signature, final Document document)
+            throws MarshallingException {
         log.debug("Starting to marshall {}", signature.getElementQName());
 
         try {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
index d348ece..70238cc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
@@ -53,7 +53,7 @@ public class SignatureUnmarshaller implements Unmarshaller {
     }
 
     /** {@inheritDoc} */
-    public Signature unmarshall(Element signatureElement) throws UnmarshallingException {
+    public Signature unmarshall(final Element signatureElement) throws UnmarshallingException {
         log.debug("Starting to unmarshall Apache XML-Security-based SignatureImpl element");
 
         SignatureImpl signature =
@@ -83,7 +83,7 @@ public class SignatureUnmarshaller implements Unmarshaller {
             signature.setXMLSignature(xmlSignature);
             signature.setDOM(signatureElement);
             return signature;
-        } catch (XMLSecurityException e) {
+        } catch (final XMLSecurityException e) {
             log.error("Error constructing Apache XMLSignature instance from Signature element: {}", e.getMessage());
             throw new UnmarshallingException("Unable to unmarshall Signature with Apache XMLSignature", e);
         }
@@ -95,7 +95,7 @@ public class SignatureUnmarshaller implements Unmarshaller {
      * @param signatureMethodElement the ds:SignatureMethod element
      * @return the HMAC output length value, or null if not present
      */
-    private Integer getHMACOutputLengthValue(Element signatureMethodElement) {
+    private Integer getHMACOutputLengthValue(final Element signatureMethodElement) {
         if (signatureMethodElement == null) {
             return null;
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformBuilder.java
index 55b4bd2..ad40640 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformBuilder.java
@@ -34,7 +34,7 @@ public class TransformBuilder extends AbstractXMLObjectBuilder<Transform> implem
     }
 
     /** {@inheritDoc} */
-    public Transform buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Transform buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new TransformImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
index 61c204d..cc0efd9 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
@@ -47,7 +47,7 @@ public class TransformImpl extends AbstractXMLObject implements Transform {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected TransformImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TransformImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -58,7 +58,7 @@ public class TransformImpl extends AbstractXMLObject implements Transform {
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         this.algorithm = prepareForAssignment(this.algorithm, newAlgorithm);
     }
 
@@ -68,7 +68,7 @@ public class TransformImpl extends AbstractXMLObject implements Transform {
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) indexedChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
index 03d7b76..a085476 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class TransformMarshaller extends AbstractXMLSignatureMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         Transform transform = (Transform) xmlObject;
 
         if (transform.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
index c312054..2c526ef 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class TransformUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         Transform transform = (Transform) xmlObject;
 
         if (attribute.getLocalName().equals(Transform.ALGORITHM_ATTRIB_NAME)) {
@@ -39,7 +39,7 @@ public class TransformUnmarshaller extends AbstractXMLSignatureUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         Transform transform = (Transform) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsBuilder.java
index 59553c4..c367adc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsBuilder.java
@@ -34,7 +34,7 @@ public class TransformsBuilder extends AbstractXMLObjectBuilder<Transforms> impl
     }
 
     /** {@inheritDoc} */
-    public Transforms buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Transforms buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new TransformsImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
index 83881fa..0c6e8fa 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
@@ -42,7 +42,7 @@ public class TransformsImpl extends AbstractXMLObject implements Transforms {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected TransformsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TransformsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         transforms = new XMLObjectChildrenList<Transform>(this);
     }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
index 7672776..a17106e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.xmlsec.signature.Transforms;
 public class TransformsUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         Transforms transforms = (Transforms) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLBuilder.java
index 11a8e2c..73cf24d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLBuilder.java
@@ -34,7 +34,7 @@ public class X509CRLBuilder extends AbstractXMLObjectBuilder<X509CRL> implements
     }
 
     /** {@inheritDoc} */
-    public X509CRL buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509CRL buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new X509CRLImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
index 58efd51..f9a02b8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
@@ -43,7 +43,7 @@ public class X509CRLImpl extends AbstractXMLObject implements X509CRL {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509CRLImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509CRLImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -53,7 +53,7 @@ public class X509CRLImpl extends AbstractXMLObject implements X509CRL {
     }
 
     /** {@inheritDoc} */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         // Dump our cached DOM if the new value really is new
         final String currentCert = B64_CRL_STORE.get(b64CRLIndex);
         final String b64Cert = prepareForAssignment(currentCert, newValue);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateBuilder.java
index 5fad180..21fbe87 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateBuilder.java
@@ -35,7 +35,8 @@ public class X509CertificateBuilder extends AbstractXMLObjectBuilder<X509Certifi
     }
 
     /** {@inheritDoc} */
-    public X509Certificate buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509Certificate buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new X509CertificateImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
index 7c20dc5..9f65e36 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
@@ -43,7 +43,8 @@ public class X509CertificateImpl extends AbstractXMLObject implements X509Certif
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509CertificateImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509CertificateImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +56,7 @@ public class X509CertificateImpl extends AbstractXMLObject implements X509Certif
 
     /** {@inheritDoc} */
     @Override
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         // Dump our cached DOM if the new value really is new
         final String currentCert = B64_CERT_STORE.get(b64CertIndex);
         final String b64Cert = prepareForAssignment(currentCert, newValue);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataBuilder.java
index e9c0f79..811fb9d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataBuilder.java
@@ -34,7 +34,7 @@ public class X509DataBuilder extends AbstractXMLObjectBuilder<X509Data> implemen
     }
 
     /** {@inheritDoc} */
-    public X509Data buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509Data buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new X509DataImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
index 9e9d5f6..4e8dcb7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
@@ -47,7 +47,7 @@ public class X509DataImpl extends AbstractXMLObject implements X509Data {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509DataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509DataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList(this);
     }
@@ -58,7 +58,7 @@ public class X509DataImpl extends AbstractXMLObject implements X509Data {
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) indexedChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
index 0cd1119..5753c31 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.xmlsec.signature.X509Data;
 public class X509DataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         X509Data x509Data = (X509Data) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestBuilder.java
index 37cd065..3247adf 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestBuilder.java
@@ -35,7 +35,7 @@ public class X509DigestBuilder extends AbstractXMLObjectBuilder<X509Digest>
     }
 
     /** {@inheritDoc} */
-    public X509Digest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509Digest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new X509DigestImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestImpl.java
index 540876d..9fe2335 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestImpl.java
@@ -35,7 +35,7 @@ public class X509DigestImpl extends XSBase64BinaryImpl implements X509Digest {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509DigestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509DigestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -45,7 +45,7 @@ public class X509DigestImpl extends XSBase64BinaryImpl implements X509Digest {
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         algorithm = prepareForAssignment(algorithm, newAlgorithm);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
index 7517730..e35dcab 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class X509DigestMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         X509Digest xd = (X509Digest) xmlObject;
 
         if (xd.getAlgorithm() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
index 1daef9b..ee17b12 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class X509DigestUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         X509Digest xd = (X509Digest) xmlObject;
 
         if (attribute.getLocalName().equals(X509Digest.ALGORITHM_ATTRIB_NAME)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameBuilder.java
index 77a8676..262a0dc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameBuilder.java
@@ -35,7 +35,7 @@ public class X509IssuerNameBuilder extends AbstractXMLObjectBuilder<X509IssuerNa
     }
 
     /** {@inheritDoc} */
-    public X509IssuerName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509IssuerName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new X509IssuerNameImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameImpl.java
index 36719f1..ceadc8e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameImpl.java
@@ -32,7 +32,8 @@ public class X509IssuerNameImpl extends XSStringImpl implements X509IssuerName {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509IssuerNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509IssuerNameImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialBuilder.java
index d1a00c1..c130dfa 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialBuilder.java
@@ -35,7 +35,8 @@ public class X509IssuerSerialBuilder extends AbstractXMLObjectBuilder<X509Issuer
     }
 
     /** {@inheritDoc} */
-    public X509IssuerSerial buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509IssuerSerial buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new X509IssuerSerialImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
index 6482c4f..2f554f8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
@@ -45,7 +45,8 @@ public class X509IssuerSerialImpl extends AbstractXMLObject implements X509Issue
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509IssuerSerialImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509IssuerSerialImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +56,7 @@ public class X509IssuerSerialImpl extends AbstractXMLObject implements X509Issue
     }
 
     /** {@inheritDoc} */
-    public void setX509IssuerName(X509IssuerName newX509IssuerName) {
+    public void setX509IssuerName(final X509IssuerName newX509IssuerName) {
         this.issuerName = prepareForAssignment(this.issuerName, newX509IssuerName);
     }
 
@@ -65,7 +66,7 @@ public class X509IssuerSerialImpl extends AbstractXMLObject implements X509Issue
     }
 
     /** {@inheritDoc} */
-    public void setX509SerialNumber(X509SerialNumber newX509SerialNumber) {
+    public void setX509SerialNumber(final X509SerialNumber newX509SerialNumber) {
         this.serialNumber = prepareForAssignment(this.serialNumber, newX509SerialNumber);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
index 20abaed..4b1b65c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.xmlsec.signature.X509SerialNumber;
 public class X509IssuerSerialUnmarshaller extends AbstractXMLSignatureUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         X509IssuerSerial keyValue = (X509IssuerSerial) parentXMLObject;
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIBuilder.java
index 4f8c9d7..3e89343 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIBuilder.java
@@ -34,7 +34,7 @@ public class X509SKIBuilder extends AbstractXMLObjectBuilder<X509SKI> implements
     }
 
     /** {@inheritDoc} */
-    public X509SKI buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509SKI buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new X509SKIImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIImpl.java
index aa3c3a1..2df5537 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SKIImpl.java
@@ -32,7 +32,7 @@ public class X509SKIImpl extends XSBase64BinaryImpl implements X509SKI {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509SKIImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509SKIImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberBuilder.java
index fa38c25..8f11c5c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberBuilder.java
@@ -36,7 +36,8 @@ public class X509SerialNumberBuilder extends AbstractXMLObjectBuilder<X509Serial
     }
 
     /** {@inheritDoc} */
-    public X509SerialNumber buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509SerialNumber buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new X509SerialNumberImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberImpl.java
index f87dd73..c548d91 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberImpl.java
@@ -39,7 +39,8 @@ public class X509SerialNumberImpl extends AbstractXMLObject implements X509Seria
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509SerialNumberImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509SerialNumberImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -49,7 +50,7 @@ public class X509SerialNumberImpl extends AbstractXMLObject implements X509Seria
     }
 
     /** {@inheritDoc} */
-    public void setValue(BigInteger newValue) {
+    public void setValue(final BigInteger newValue) {
         value = prepareForAssignment(value, newValue);
     }
     
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
index 030c57e..b5542ba 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
@@ -31,12 +31,13 @@ import org.w3c.dom.Element;
 public class X509SerialNumberMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
         
         if (x509SerialNumber.getValue() != null) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
index e9c79c6..6990e29 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
@@ -33,18 +33,18 @@ import com.google.common.base.Strings;
 public class X509SerialNumberUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         // no children
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         //no attributes
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
         
         if(!Strings.isNullOrEmpty(elementContent)){
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameBuilder.java
index afbe299..db4463d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameBuilder.java
@@ -35,7 +35,8 @@ public class X509SubjectNameBuilder extends AbstractXMLObjectBuilder<X509Subject
     }
 
     /** {@inheritDoc} */
-    public X509SubjectName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public X509SubjectName buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new X509SubjectNameImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameImpl.java
index 8b99cba..10c9679 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameImpl.java
@@ -32,7 +32,8 @@ public class X509SubjectNameImpl extends XSStringImpl implements X509SubjectName
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected X509SubjectNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected X509SubjectNameImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathBuilder.java
index 9868b09..2872b5b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathBuilder.java
@@ -34,7 +34,7 @@ public class XPathBuilder extends AbstractXMLObjectBuilder<XPath> implements XML
     }
 
     /** {@inheritDoc} */
-    public XPath buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public XPath buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new XPathImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathImpl.java
index fedb20e..94b7fb0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/XPathImpl.java
@@ -32,7 +32,7 @@ public class XPathImpl extends XSStringImpl implements XPath {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected XPathImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected XPathImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YBuilder.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YBuilder.java
index 86fe73e..9b80039 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YBuilder.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YBuilder.java
@@ -35,7 +35,7 @@ public class YBuilder extends AbstractXMLObjectBuilder<Y> implements XMLSignatur
     }
 
     /** {@inheritDoc} */
-    public Y buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Y buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new YImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YImpl.java
index f2efacd..ac142e7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/YImpl.java
@@ -31,7 +31,7 @@ public class YImpl extends CryptoBinaryImpl implements Y {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected YImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected YImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
index eff3b0a..074c180 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
@@ -96,7 +96,7 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
                     new SignatureAlgorithmValidator(validationCriterion.getSignatureValidationParameters());
             try {
                 algorithmValidator.validate(signature);
-            } catch (SignatureException e) {
+            } catch (final SignatureException e) {
                 log.warn("XML signature failed algorithm whitelist/blacklist validation");
                 return false;
             }
@@ -206,7 +206,7 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
                         }
                     }
                 }
-            } catch (ResolverException e) {
+            } catch (final ResolverException e) {
                 throw new SecurityException("Error resolving KeyInfo from KeyInfoResolver", e);
             }
         } else {
@@ -240,7 +240,7 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
     protected boolean verifySignature(@Nonnull final Signature signature, @Nonnull final Credential credential) {
         try {
             SignatureValidator.validate(signature, credential);
-        } catch (SignatureException e) {
+        } catch (final SignatureException e) {
             log.debug("Signature validation using candidate validation credential failed", e);
             return false;
         }
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
index f8075ae..2c7294c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
@@ -71,7 +71,7 @@ public class ApacheSantuarioSignatureValidationProviderImpl implements Signature
                 log.debug("Signature validated with key from supplied credential");
                 return;
             }
-        } catch (XMLSignatureException e) {
+        } catch (final XMLSignatureException e) {
             throw new SignatureException("Unable to evaluate key against signature", e);
         }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
index b3e2791..30aa6c7 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
@@ -57,7 +57,7 @@ public class ApacheSantuarioSignerProviderImpl implements SignerProvider {
             }
             log.debug("Computing signature over XMLSignature object");
             xmlSignature.sign(CredentialSupport.extractSigningKey(signature.getSigningCredential()));
-        } catch (XMLSecurityException e) {
+        } catch (final XMLSecurityException e) {
             log.error("An error occured computing the digital signature", e);
             throw new SignatureException("Signature computation error", e);
         }

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


More information about the commits mailing list