[java-opensaml] 04/04: JPAR-85 - Checkstyle, check final variables

Tom Zeller tzeller at dragonacea.biz
Wed Aug 9 23:27:12 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=48bb3af55e4a262942aae84dcaf8617ba2faa1c0

commit 48bb3af55e4a262942aae84dcaf8617ba2faa1c0
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 22:24:58 2017 -0500

    JPAR-85 - Checkstyle, check final variables
---
 .../http/impl/HttpClientResponseSOAP11Decoder.java | 18 +++++++-------
 .../http/impl/HttpClientRequestSOAP11Encoder.java  | 16 ++++++------
 .../decoder/http/impl/EnvelopeBodyHandler.java     |  2 +-
 .../decoder/http/impl/HTTPSOAP11Decoder.java       |  6 ++---
 .../http/impl/SimplePayloadBodyHandler.java        |  4 +--
 .../encoder/http/impl/HTTPSOAP11Encoder.java       | 29 +++++++++++-----------
 .../opensaml/soap/soap11/impl/BodyMarshaller.java  |  4 +--
 .../soap/soap11/impl/BodyUnmarshaller.java         |  8 +++---
 .../soap/soap11/impl/DetailMarshaller.java         |  4 +--
 .../soap/soap11/impl/DetailUnmarshaller.java       |  8 +++---
 .../opensaml/soap/soap11/impl/EnvelopeImpl.java    |  2 +-
 .../soap/soap11/impl/EnvelopeMarshaller.java       |  4 +--
 .../soap/soap11/impl/EnvelopeUnmarshaller.java     |  8 +++---
 .../org/opensaml/soap/soap11/impl/FaultImpl.java   |  2 +-
 .../soap/soap11/impl/FaultUnmarshaller.java        |  2 +-
 .../soap/soap11/impl/HeaderMarshaller.java         |  4 +--
 .../soap/soap11/impl/HeaderUnmarshaller.java       |  8 +++---
 .../SOAP11FaultContextDecoratingErrorHandler.java  |  2 +-
 .../soap/soap11/profile/impl/AddSOAPFault.java     |  2 +-
 .../impl/AttributedQNameMarshaller.java            |  2 +-
 .../impl/AttributedQNameUnmarshaller.java          |  2 +-
 .../wsaddressing/impl/AttributedURIMarshaller.java |  4 +--
 .../impl/AttributedURIUnmarshaller.java            |  4 +--
 .../impl/AttributedUnsignedLongMarshaller.java     |  4 +--
 .../impl/AttributedUnsignedLongUnmarshaller.java   |  4 +--
 .../impl/EndpointReferenceTypeImpl.java            |  2 +-
 .../impl/EndpointReferenceTypeMarshaller.java      |  2 +-
 .../impl/EndpointReferenceTypeUnmarshaller.java    |  4 +--
 .../soap/wsaddressing/impl/MetadataImpl.java       |  2 +-
 .../soap/wsaddressing/impl/MetadataMarshaller.java |  2 +-
 .../wsaddressing/impl/MetadataUnmarshaller.java    |  4 +--
 .../soap/wsaddressing/impl/ProblemActionImpl.java  |  2 +-
 .../wsaddressing/impl/ProblemActionMarshaller.java |  2 +-
 .../impl/ProblemActionUnmarshaller.java            |  4 +--
 .../wsaddressing/impl/ReferenceParametersImpl.java |  2 +-
 .../impl/ReferenceParametersMarshaller.java        |  2 +-
 .../impl/ReferenceParametersUnmarshaller.java      |  4 +--
 .../wsaddressing/impl/RelatesToMarshaller.java     |  4 +--
 .../wsaddressing/impl/RelatesToUnmarshaller.java   |  2 +-
 .../messaging/impl/AddActionHandler.java           |  6 ++---
 .../messaging/impl/AddMessageIDHandler.java        |  6 ++---
 .../messaging/impl/AddRelatesToHandler.java        |  4 +--
 .../messaging/impl/ExtractMessageIDHandler.java    |  7 +++---
 .../messaging/impl/ValidateActionHandler.java      |  8 +++---
 .../soap/wsfed/impl/AddressMarshaller.java         |  2 +-
 .../soap/wsfed/impl/AddressUnmarshaller.java       |  2 +-
 .../opensaml/soap/wsfed/impl/AppliesToImpl.java    |  2 +-
 .../soap/wsfed/impl/AppliesToUnmarshaller.java     |  2 +-
 .../soap/wsfed/impl/EndPointReferenceImpl.java     |  2 +-
 .../wsfed/impl/EndPointReferenceUnmarshaller.java  |  2 +-
 .../impl/RequestSecurityTokenResponseImpl.java     |  2 +-
 .../RequestSecurityTokenResponseUnmarshaller.java  |  2 +-
 .../wsfed/impl/RequestedSecurityTokenImpl.java     |  2 +-
 .../impl/RequestedSecurityTokenUnmarshaller.java   |  2 +-
 .../opensaml/soap/wspolicy/impl/AppliesToImpl.java |  2 +-
 .../soap/wspolicy/impl/AppliesToMarshaller.java    |  2 +-
 .../soap/wspolicy/impl/AppliesToUnmarshaller.java  |  4 +--
 .../wspolicy/impl/OperatorContentTypeImpl.java     |  2 +-
 .../impl/OperatorContentTypeUnmarshaller.java      |  2 +-
 .../soap/wspolicy/impl/PolicyAttachmentImpl.java   |  2 +-
 .../wspolicy/impl/PolicyAttachmentMarshaller.java  |  2 +-
 .../impl/PolicyAttachmentUnmarshaller.java         |  4 +--
 .../opensaml/soap/wspolicy/impl/PolicyImpl.java    |  2 +-
 .../soap/wspolicy/impl/PolicyMarshaller.java       |  2 +-
 .../wspolicy/impl/PolicyReferenceMarshaller.java   |  2 +-
 .../wspolicy/impl/PolicyReferenceUnmarshaller.java | 10 ++++----
 .../soap/wspolicy/impl/PolicyUnmarshaller.java     |  6 ++---
 .../wssecurity/impl/AttributedDateTimeImpl.java    |  4 +--
 .../impl/AttributedDateTimeMarshaller.java         |  4 +--
 .../impl/AttributedDateTimeUnmarshaller.java       |  6 ++---
 .../soap/wssecurity/impl/AttributedStringImpl.java |  2 +-
 .../impl/AttributedStringMarshaller.java           |  4 +--
 .../impl/AttributedStringUnmarshaller.java         |  6 ++---
 .../soap/wssecurity/impl/AttributedURIImpl.java    |  2 +-
 .../wssecurity/impl/AttributedURIMarshaller.java   |  4 +--
 .../wssecurity/impl/AttributedURIUnmarshaller.java |  6 ++---
 .../impl/BinarySecurityTokenMarshaller.java        |  2 +-
 .../impl/BinarySecurityTokenUnmarshaller.java      |  2 +-
 .../soap/wssecurity/impl/EmbeddedImpl.java         |  2 +-
 .../soap/wssecurity/impl/EmbeddedMarshaller.java   |  2 +-
 .../soap/wssecurity/impl/EmbeddedUnmarshaller.java |  6 ++---
 .../wssecurity/impl/EncodedStringMarshaller.java   |  2 +-
 .../wssecurity/impl/EncodedStringUnmarshaller.java |  2 +-
 .../soap/wssecurity/impl/EncryptedHeaderImpl.java  |  4 +--
 .../wssecurity/impl/EncryptedHeaderMarshaller.java |  2 +-
 .../impl/EncryptedHeaderUnmarshaller.java          |  6 ++---
 .../soap/wssecurity/impl/IterationMarshaller.java  |  2 +-
 .../wssecurity/impl/IterationUnmarshaller.java     |  2 +-
 .../wssecurity/impl/KeyIdentifierMarshaller.java   |  2 +-
 .../wssecurity/impl/KeyIdentifierUnmarshaller.java |  2 +-
 .../soap/wssecurity/impl/PasswordMarshaller.java   |  2 +-
 .../soap/wssecurity/impl/PasswordUnmarshaller.java |  2 +-
 .../soap/wssecurity/impl/ReferenceMarshaller.java  |  2 +-
 .../wssecurity/impl/ReferenceUnmarshaller.java     |  4 +--
 .../soap/wssecurity/impl/SaltMarshaller.java       |  2 +-
 .../soap/wssecurity/impl/SaltUnmarshaller.java     |  2 +-
 .../soap/wssecurity/impl/SecurityImpl.java         |  2 +-
 .../soap/wssecurity/impl/SecurityMarshaller.java   |  2 +-
 .../impl/SecurityTokenReferenceImpl.java           |  4 +--
 .../impl/SecurityTokenReferenceMarshaller.java     |  4 +--
 .../impl/SecurityTokenReferenceUnmarshaller.java   |  6 ++---
 .../soap/wssecurity/impl/SecurityUnmarshaller.java |  4 +--
 .../wssecurity/impl/SignatureConfirmationImpl.java |  2 +-
 .../impl/SignatureConfirmationMarshaller.java      |  2 +-
 .../impl/SignatureConfirmationUnmarshaller.java    |  4 +--
 .../soap/wssecurity/impl/TimestampImpl.java        |  4 +--
 .../soap/wssecurity/impl/TimestampMarshaller.java  |  2 +-
 .../wssecurity/impl/TimestampUnmarshaller.java     |  6 ++---
 .../impl/TransformationParametersImpl.java         |  2 +-
 .../impl/TransformationParametersMarshaller.java   |  2 +-
 .../impl/TransformationParametersUnmarshaller.java |  4 +--
 .../soap/wssecurity/impl/UsernameTokenImpl.java    |  4 +--
 .../wssecurity/impl/UsernameTokenMarshaller.java   |  2 +-
 .../wssecurity/impl/UsernameTokenUnmarshaller.java |  6 ++---
 .../messaging/impl/AddTimestampHandler.java        | 10 ++++----
 .../soap/wstrust/impl/AuthenticatorImpl.java       |  2 +-
 .../wstrust/impl/AuthenticatorUnmarshaller.java    |  2 +-
 .../wstrust/impl/BinaryExchangeMarshaller.java     |  6 ++---
 .../wstrust/impl/BinaryExchangeUnmarshaller.java   |  4 +--
 .../soap/wstrust/impl/BinarySecretMarshaller.java  |  2 +-
 .../wstrust/impl/BinarySecretUnmarshaller.java     |  2 +-
 .../soap/wstrust/impl/CancelTargetImpl.java        |  2 +-
 .../wstrust/impl/CancelTargetUnmarshaller.java     |  2 +-
 .../org/opensaml/soap/wstrust/impl/ClaimsImpl.java |  2 +-
 .../soap/wstrust/impl/ClaimsMarshaller.java        |  2 +-
 .../soap/wstrust/impl/ClaimsUnmarshaller.java      |  4 +--
 .../soap/wstrust/impl/DelegatableMarshaller.java   |  4 +--
 .../soap/wstrust/impl/DelegatableUnmarshaller.java |  4 +--
 .../opensaml/soap/wstrust/impl/DelegateToImpl.java |  2 +-
 .../soap/wstrust/impl/DelegateToUnmarshaller.java  |  2 +-
 .../opensaml/soap/wstrust/impl/EncryptionImpl.java |  2 +-
 .../soap/wstrust/impl/EncryptionUnmarshaller.java  |  2 +-
 .../opensaml/soap/wstrust/impl/EntropyImpl.java    |  2 +-
 .../soap/wstrust/impl/EntropyMarshaller.java       |  2 +-
 .../soap/wstrust/impl/EntropyUnmarshaller.java     |  4 +--
 .../soap/wstrust/impl/ForwardableMarshaller.java   |  4 +--
 .../soap/wstrust/impl/ForwardableUnmarshaller.java |  4 +--
 .../wstrust/impl/KeyExchangeTokenUnmarshaller.java |  2 +-
 .../opensaml/soap/wstrust/impl/LifetimeImpl.java   |  2 +-
 .../soap/wstrust/impl/LifetimeUnmarshaller.java    |  2 +-
 .../opensaml/soap/wstrust/impl/OnBehalfOfImpl.java |  2 +-
 .../soap/wstrust/impl/OnBehalfOfUnmarshaller.java  |  2 +-
 .../soap/wstrust/impl/ParticipantTypeImpl.java     |  2 +-
 .../wstrust/impl/ParticipantTypeUnmarshaller.java  |  2 +-
 .../soap/wstrust/impl/ParticipantsImpl.java        |  2 +-
 .../wstrust/impl/ParticipantsUnmarshaller.java     |  2 +-
 .../soap/wstrust/impl/ProofEncryptionImpl.java     |  2 +-
 .../wstrust/impl/ProofEncryptionUnmarshaller.java  |  2 +-
 .../soap/wstrust/impl/RenewTargetImpl.java         |  2 +-
 .../soap/wstrust/impl/RenewTargetUnmarshaller.java |  2 +-
 .../soap/wstrust/impl/RenewingMarshaller.java      |  2 +-
 .../soap/wstrust/impl/RenewingUnmarshaller.java    |  2 +-
 .../impl/RequestSecurityTokenCollectionImpl.java   |  2 +-
 ...RequestSecurityTokenCollectionUnmarshaller.java |  2 +-
 .../wstrust/impl/RequestSecurityTokenImpl.java     |  2 +-
 .../impl/RequestSecurityTokenMarshaller.java       |  2 +-
 ...RequestSecurityTokenResponseCollectionImpl.java |  2 +-
 ...tSecurityTokenResponseCollectionMarshaller.java |  2 +-
 ...ecurityTokenResponseCollectionUnmarshaller.java |  4 +--
 .../impl/RequestSecurityTokenResponseImpl.java     |  2 +-
 .../RequestSecurityTokenResponseMarshaller.java    |  2 +-
 .../RequestSecurityTokenResponseUnmarshaller.java  |  4 +--
 .../impl/RequestSecurityTokenUnmarshaller.java     |  4 +--
 .../soap/wstrust/impl/RequestedProofTokenImpl.java |  2 +-
 .../impl/RequestedProofTokenUnmarshaller.java      |  2 +-
 .../wstrust/impl/RequestedReferenceTypeImpl.java   |  2 +-
 .../impl/RequestedReferenceTypeUnmarshaller.java   |  2 +-
 .../wstrust/impl/RequestedSecurityTokenImpl.java   |  2 +-
 .../impl/RequestedSecurityTokenUnmarshaller.java   |  2 +-
 .../soap/wstrust/impl/SignChallengeTypeImpl.java   |  2 +-
 .../wstrust/impl/SignChallengeTypeMarshaller.java  |  2 +-
 .../impl/SignChallengeTypeUnmarshaller.java        |  4 +--
 .../org/opensaml/soap/wstrust/impl/StatusImpl.java |  2 +-
 .../soap/wstrust/impl/StatusUnmarshaller.java      |  2 +-
 .../org/opensaml/soap/wstrust/impl/UseKeyImpl.java |  2 +-
 .../soap/wstrust/impl/UseKeyMarshaller.java        |  2 +-
 .../soap/wstrust/impl/UseKeyUnmarshaller.java      |  4 +--
 .../soap/wstrust/impl/ValidateTargetImpl.java      |  2 +-
 .../wstrust/impl/ValidateTargetUnmarshaller.java   |  2 +-
 179 files changed, 302 insertions(+), 300 deletions(-)

diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11Decoder.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11Decoder.java
index f7f7b8d..9c0d01a 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11Decoder.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/decoder/http/impl/HttpClientResponseSOAP11Decoder.java
@@ -85,16 +85,16 @@ public class HttpClientResponseSOAP11Decoder<MessageType extends XMLObject>
 
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<MessageType> messageContext = new MessageContext<>();
-        HttpResponse response = getHttpResponse();
+        final MessageContext<MessageType> messageContext = new MessageContext<>();
+        final HttpResponse response = getHttpResponse();
         
         log.debug("Unmarshalling SOAP message");
         try {
-            int responseStatusCode = response.getStatusLine().getStatusCode();
+            final int responseStatusCode = response.getStatusLine().getStatusCode();
             
             switch(responseStatusCode) {
                 case HttpStatus.SC_OK:
-                    SOAP11Context soapContext = messageContext.getSubcontext(SOAP11Context.class, true);
+                    final SOAP11Context soapContext = messageContext.getSubcontext(SOAP11Context.class, true);
                     processSuccessResponse(response, soapContext);
                     break;
                 case HttpStatus.SC_INTERNAL_SERVER_ERROR:
@@ -148,10 +148,10 @@ public class HttpClientResponseSOAP11Decoder<MessageType extends XMLObject>
         if (httpResponse.getEntity() == null) {
             throw new MessageDecodingException("No response body from server");
         }
-        Envelope soapMessage = (Envelope) unmarshallMessage(httpResponse.getEntity().getContent());
+        final Envelope soapMessage = (Envelope) unmarshallMessage(httpResponse.getEntity().getContent());
         
         // Defensive sanity check, otherwise body handler could later fail non-gracefully with runtime exception
-        Fault fault = getFault(soapMessage);
+        final Fault fault = getFault(soapMessage);
         if (fault != null) {
             throw new SOAP11FaultDecodingException(fault);
         }
@@ -175,9 +175,9 @@ public class HttpClientResponseSOAP11Decoder<MessageType extends XMLObject>
         if (response.getEntity() == null) {
             throw new MessageDecodingException("No response body from server");
         }
-        Envelope soapMessage = (Envelope) unmarshallMessage(response.getEntity().getContent());
+        final Envelope soapMessage = (Envelope) unmarshallMessage(response.getEntity().getContent());
         
-        Fault fault = getFault(soapMessage);
+        final Fault fault = getFault(soapMessage);
         if (fault == null) {
             throw new MessageDecodingException("HTTP status code was 500 but SOAP response did not contain a Fault");
         }
@@ -203,7 +203,7 @@ public class HttpClientResponseSOAP11Decoder<MessageType extends XMLObject>
      */
     protected Fault getFault(final Envelope soapMessage) {
         if (soapMessage.getBody() != null) {
-            List<XMLObject> faults = soapMessage.getBody().getUnknownXMLObjects(Fault.DEFAULT_ELEMENT_NAME);
+            final List<XMLObject> faults = soapMessage.getBody().getUnknownXMLObjects(Fault.DEFAULT_ELEMENT_NAME);
             if (!faults.isEmpty()) {
                 return (Fault) faults.get(0);
             } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11Encoder.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11Encoder.java
index 41d1a4c..500e678 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11Encoder.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/client/soap11/encoder/http/impl/HttpClientRequestSOAP11Encoder.java
@@ -69,7 +69,7 @@ public class HttpClientRequestSOAP11Encoder<MessageType extends XMLObject>
     /** Constructor. */
     public HttpClientRequestSOAP11Encoder() {
         super();
-        XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+        final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
         envBuilder = (SOAPObjectBuilder<Envelope>) builderFactory.getBuilder(Envelope.DEFAULT_ELEMENT_NAME);
         bodyBuilder = (SOAPObjectBuilder<Body>) builderFactory.getBuilder(Body.DEFAULT_ELEMENT_NAME);
         
@@ -99,8 +99,8 @@ public class HttpClientRequestSOAP11Encoder<MessageType extends XMLObject>
 
     /** {@inheritDoc} */
     public void prepareContext() throws MessageEncodingException {
-        MessageContext<MessageType> messageContext = getMessageContext();
-        MessageType message = messageContext.getMessage();
+        final MessageContext<MessageType> messageContext = getMessageContext();
+        final MessageType message = messageContext.getMessage();
         if (message == null) {
             throw new MessageEncodingException("No outbound message contained in message context");
         }
@@ -115,7 +115,7 @@ public class HttpClientRequestSOAP11Encoder<MessageType extends XMLObject>
 
     /** {@inheritDoc} */
     protected void doEncode() throws MessageEncodingException {
-        Envelope envelope = getSOAPEnvelope();
+        final Envelope envelope = getSOAPEnvelope();
         
         prepareHttpRequest();
 
@@ -205,7 +205,7 @@ public class HttpClientRequestSOAP11Encoder<MessageType extends XMLObject>
      */
     protected void prepareHttpRequest() throws MessageEncodingException {
         //TODO - need to do more here?
-        String soapAction = getSOAPAction();
+        final String soapAction = getSOAPAction();
         if (soapAction != null) {
             getHttpRequest().setHeader("SOAPAction", soapAction);
         } else {
@@ -224,12 +224,12 @@ public class HttpClientRequestSOAP11Encoder<MessageType extends XMLObject>
      * @return a SOAPAction HTTP header URI value
      */
     protected String getSOAPAction() {
-        Envelope env = getSOAPEnvelope();
-        Header header = env.getHeader();
+        final Envelope env = getSOAPEnvelope();
+        final Header header = env.getHeader();
         if (header == null) {
             return null;
         }
-        List<XMLObject> objList = header.getUnknownXMLObjects(Action.ELEMENT_NAME);
+        final List<XMLObject> objList = header.getUnknownXMLObjects(Action.ELEMENT_NAME);
         if (objList == null || objList.isEmpty()) {
             return null;
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/EnvelopeBodyHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/EnvelopeBodyHandler.java
index 438399c..24461b3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/EnvelopeBodyHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/EnvelopeBodyHandler.java
@@ -33,7 +33,7 @@ public class EnvelopeBodyHandler extends AbstractMessageHandler<Envelope> {
 
     /** {@inheritDoc} */
     protected void doInvoke(@Nonnull final MessageContext<Envelope> messageContext) throws MessageHandlerException {
-        Envelope env = (Envelope) messageContext.getSubcontext(SOAP11Context.class).getEnvelope();
+        final Envelope env = (Envelope) messageContext.getSubcontext(SOAP11Context.class).getEnvelope();
         if (env == null) {
             throw new MessageHandlerException("MessageContext did not contain a SOAP Envelope");
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11Decoder.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11Decoder.java
index 422da68..fbda03f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11Decoder.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11Decoder.java
@@ -88,15 +88,15 @@ public class HTTPSOAP11Decoder<MessageType extends XMLObject>
     /** {@inheritDoc} */
     @Override
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<MessageType> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<MessageType> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
 
         if (!"POST".equalsIgnoreCase(request.getMethod())) {
             throw new MessageDecodingException("This message decoder only supports the HTTP POST method");
         }
 
         log.debug("Unmarshalling SOAP message");
-        Envelope soapMessage;
+        final Envelope soapMessage;
         try {
             soapMessage = (Envelope) unmarshallMessage(request.getInputStream());
             messageContext.getSubcontext(SOAP11Context.class, true).setEnvelope(soapMessage);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/SimplePayloadBodyHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/SimplePayloadBodyHandler.java
index df2b2e1..096ad0c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/SimplePayloadBodyHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/impl/SimplePayloadBodyHandler.java
@@ -42,8 +42,8 @@ public class SimplePayloadBodyHandler<MessageType extends XMLObject> extends Abs
 
     /** {@inheritDoc} */
     protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
-        Envelope env = (Envelope) messageContext.getSubcontext(SOAP11Context.class).getEnvelope();
-        List<XMLObject> bodyChildren = env.getBody().getUnknownXMLObjects();
+        final Envelope env = (Envelope) messageContext.getSubcontext(SOAP11Context.class).getEnvelope();
+        final List<XMLObject> bodyChildren = env.getBody().getUnknownXMLObjects();
         if (bodyChildren == null || bodyChildren.isEmpty()) {
             throw new MessageHandlerException("SOAP Envelope Body contained no children");
         } else if (bodyChildren.size() > 1) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11Encoder.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11Encoder.java
index 8e4d8cf..9e93c39 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11Encoder.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11Encoder.java
@@ -65,7 +65,7 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
     /** Constructor. */
     public HTTPSOAP11Encoder() {
         super();
-        XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+        final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
         envBuilder = (SOAPObjectBuilder<Envelope>) builderFactory.getBuilder(Envelope.DEFAULT_ELEMENT_NAME);
         bodyBuilder = (SOAPObjectBuilder<Body>) builderFactory.getBuilder(Body.DEFAULT_ELEMENT_NAME);
         
@@ -75,10 +75,10 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
     
     /** {@inheritDoc} */
     public void prepareContext() throws MessageEncodingException {
-        MessageContext<MessageType> messageContext = getMessageContext();
+        final MessageContext<MessageType> messageContext = getMessageContext();
         XMLObject payload = null;
         
-        Fault fault = SOAPMessagingSupport.getSOAP11Fault(messageContext);
+        final Fault fault = SOAPMessagingSupport.getSOAP11Fault(messageContext);
         if (fault != null) {
             log.debug("Saw SOAP 1.1 Fault payload with fault code, replacing any existing context message: {}", 
                     fault.getCode() != null ? fault.getCode().getValue() : null);
@@ -102,8 +102,8 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
 
     /** {@inheritDoc} */
     protected void doEncode() throws MessageEncodingException {
-        Envelope envelope = getSOAPEnvelope();
-        Element envelopeElem = marshallMessage(envelope);
+        final Envelope envelope = getSOAPEnvelope();
+        final Element envelopeElem = marshallMessage(envelope);
         
         prepareHttpServletResponse();
 
@@ -179,12 +179,12 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
      * @throws MessageEncodingException thrown if there is a problem preprocessing the transport
      */
     protected void prepareHttpServletResponse() throws MessageEncodingException {
-        HttpServletResponse response = getHttpServletResponse();
+        final HttpServletResponse response = getHttpServletResponse();
         HttpServletSupport.addNoCacheHeaders(response);
         HttpServletSupport.setUTF8Encoding(response);
         HttpServletSupport.setContentType(response, "text/xml");
         
-        String soapAction = getSOAPAction();
+        final String soapAction = getSOAPAction();
         if (soapAction != null) {
             response.setHeader("SOAPAction", soapAction);
         } else {
@@ -205,12 +205,12 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
      * @return a SOAPAction HTTP header URI value
      */
     protected String getSOAPAction() {
-        Envelope env = getSOAPEnvelope();
-        Header header = env.getHeader();
+        final Envelope env = getSOAPEnvelope();
+        final Header header = env.getHeader();
         if (header == null) {
             return null;
         }
-        List<XMLObject> objList = header.getUnknownXMLObjects(Action.ELEMENT_NAME);
+        final List<XMLObject> objList = header.getUnknownXMLObjects(Action.ELEMENT_NAME);
         if (objList == null || objList.isEmpty()) {
             return null;
         } else {
@@ -224,15 +224,16 @@ public class HTTPSOAP11Encoder<MessageType extends XMLObject>
      * @return the HTTP response status code
      */
     protected int getHTTPResponseStatusCode() {
-        Integer contextStatus = getMessageContext().getSubcontext(SOAP11Context.class, true).getHTTPResponseStatus();
+        final Integer contextStatus =
+                getMessageContext().getSubcontext(SOAP11Context.class, true).getHTTPResponseStatus();
         if (contextStatus != null) {
             return contextStatus;
         }
         
-        Envelope envelope = getSOAPEnvelope();
+        final Envelope envelope = getSOAPEnvelope();
         if (envelope != null && envelope.getBody() != null) {
-            Body body = envelope.getBody();
-            List<XMLObject> faults = body.getUnknownXMLObjects(Fault.DEFAULT_ELEMENT_NAME);
+            final Body body = envelope.getBody();
+            final List<XMLObject> faults = body.getUnknownXMLObjects(Fault.DEFAULT_ELEMENT_NAME);
             if (!faults.isEmpty()) {
                 return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
             }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyMarshaller.java
index 3c73191..d9a25e1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyMarshaller.java
@@ -38,10 +38,10 @@ public class BodyMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Body body = (Body) xmlObject;
+        final Body body = (Body) xmlObject;
 
         Attr attribute;
-        for (Entry<QName, String> entry : body.getUnknownAttributes().entrySet()) {
+        for (final Entry<QName, String> entry : body.getUnknownAttributes().entrySet()) {
             attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
             attribute.setValue(entry.getValue());
             domElement.setAttributeNodeNS(attribute);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyUnmarshaller.java
index 1ebe464..8a707de 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/BodyUnmarshaller.java
@@ -35,15 +35,15 @@ public class BodyUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Body body = (Body) parentXMLObject;
+        final Body body = (Body) parentXMLObject;
         body.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Body body = (Body) xmlObject;
-        QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
-                .getPrefix());
+        final Body body = (Body) xmlObject;
+        final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(),
+                attribute.getPrefix());
         if (attribute.isId()) {
             body.getUnknownAttributes().registerID(attribQName);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailMarshaller.java
index 6441996..41a0f3d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailMarshaller.java
@@ -38,10 +38,10 @@ public class DetailMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Detail detail = (Detail) xmlObject;
+        final Detail detail = (Detail) xmlObject;
 
         Attr attribute;
-        for (Entry<QName, String> entry : detail.getUnknownAttributes().entrySet()) {
+        for (final Entry<QName, String> entry : detail.getUnknownAttributes().entrySet()) {
             attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
             attribute.setValue(entry.getValue());
             domElement.setAttributeNodeNS(attribute);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailUnmarshaller.java
index 2f50bbb..453ef4e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/DetailUnmarshaller.java
@@ -35,15 +35,15 @@ public class DetailUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Detail detail = (Detail) parentXMLObject;
+        final Detail detail = (Detail) parentXMLObject;
         detail.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Detail detail = (Detail) xmlObject;
-        QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
-                .getPrefix());
+        final Detail detail = (Detail) xmlObject;
+        final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(),
+                attribute.getPrefix());
         if (attribute.isId()) {
             detail.getUnknownAttributes().registerID(attribQName);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeImpl.java
index 1a3fc8a..a2f8c02 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeImpl.java
@@ -71,7 +71,7 @@ public class EnvelopeImpl extends AbstractExtensibleSOAPObject implements Envelo
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(header);
         children.add(body);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeMarshaller.java
index 4f33117..f4c8aa72 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeMarshaller.java
@@ -42,10 +42,10 @@ public class EnvelopeMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Envelope envelope = (Envelope) xmlObject;
+        final Envelope envelope = (Envelope) xmlObject;
 
         Attr attribute;
-        for (Entry<QName, String> entry : envelope.getUnknownAttributes().entrySet()) {
+        for (final Entry<QName, String> entry : envelope.getUnknownAttributes().entrySet()) {
             attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
             attribute.setValue(entry.getValue());
             domElement.setAttributeNodeNS(attribute);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeUnmarshaller.java
index 1f03c90..33c2eca 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/EnvelopeUnmarshaller.java
@@ -37,7 +37,7 @@ public class EnvelopeUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Envelope envelope = (Envelope) parentXMLObject;
+        final Envelope envelope = (Envelope) parentXMLObject;
 
         if (childXMLObject instanceof Header) {
             envelope.setHeader((Header) childXMLObject);
@@ -50,9 +50,9 @@ public class EnvelopeUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Envelope envelope = (Envelope) xmlObject;
-        QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
-                .getPrefix());
+        final Envelope envelope = (Envelope) xmlObject;
+        final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(),
+                attribute.getPrefix());
         if (attribute.isId()) {
             envelope.getUnknownAttributes().registerID(attribQName);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultImpl.java
index a49d3fc..8aa5699 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultImpl.java
@@ -99,7 +99,7 @@ public class FaultImpl extends AbstractXMLObject implements Fault {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(faultCode);
         children.add(message);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultUnmarshaller.java
index 3fcde2f..8653e25 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/FaultUnmarshaller.java
@@ -38,7 +38,7 @@ public class FaultUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Fault fault = (Fault) parentXMLObject;
+        final Fault fault = (Fault) parentXMLObject;
         
         if(childXMLObject instanceof XSQName){
             fault.setCode((FaultCode) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderMarshaller.java
index a7ab176..b614fdb 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderMarshaller.java
@@ -38,10 +38,10 @@ public class HeaderMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Header header = (Header) xmlObject;
+        final Header header = (Header) xmlObject;
 
         Attr attribute;
-        for (Entry<QName, String> entry : header.getUnknownAttributes().entrySet()) {
+        for (final Entry<QName, String> entry : header.getUnknownAttributes().entrySet()) {
             attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
             attribute.setValue(entry.getValue());
             domElement.setAttributeNodeNS(attribute);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderUnmarshaller.java
index d7b719b..e511f43 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/impl/HeaderUnmarshaller.java
@@ -35,15 +35,15 @@ public class HeaderUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Header header = (Header) parentXMLObject;
+        final Header header = (Header) parentXMLObject;
         header.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Header header = (Header) xmlObject;
-        QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
-                .getPrefix());
+        final Header header = (Header) xmlObject;
+        final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(),
+                attribute.getPrefix());
         if (attribute.isId()) {
             header.getUnknownAttributes().registerID(attribQName);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
index 0bc06d4..e3a78bd 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
@@ -100,7 +100,7 @@ public class SOAP11FaultContextDecoratingErrorHandler<MessageType> implements Ty
     public boolean handleError(@Nonnull final Throwable t, @Nonnull final MessageContext<MessageType> messageContext) {
         //TODO can support details?
         //TODO add Function<MessageContext,Fault> support?
-        Fault fault = SOAPSupport.buildSOAP11Fault(faultCode, faultString, faultActor, null, null);
+        final Fault fault = SOAPSupport.buildSOAP11Fault(faultCode, faultString, faultActor, null, null);
         
         SOAPMessagingSupport.registerSOAP11Fault(messageContext, fault);
         
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
index b43ba73..37aee81 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
@@ -224,7 +224,7 @@ public class AddSOAPFault extends AbstractProfileAction {
             return null;
         }
         
-        Fault fault = contextFaultStrategy.apply(profileRequestContext);
+        final Fault fault = contextFaultStrategy.apply(profileRequestContext);
         
         if (fault != null) {
             log.debug("{} Resolved Fault instance via context strategy", getLogPrefix());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameMarshaller.java
index d39d530..951a990 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameMarshaller.java
@@ -31,7 +31,7 @@ public class AttributedQNameMarshaller extends XSQNameMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedQName attributedQName = (AttributedQName) xmlObject;
+        final AttributedQName attributedQName = (AttributedQName) xmlObject;
         XMLObjectSupport.marshallAttributeMap(attributedQName.getUnknownAttributes(), domElement);
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameUnmarshaller.java
index 3cc9e27..21da8c3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedQNameUnmarshaller.java
@@ -31,7 +31,7 @@ public class AttributedQNameUnmarshaller extends XSQNameUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedQName attributedQName = (AttributedQName) xmlObject;
+        final AttributedQName attributedQName = (AttributedQName) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(attributedQName.getUnknownAttributes(), attribute);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIMarshaller.java
index 1589bf5..a498a9a 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIMarshaller.java
@@ -35,13 +35,13 @@ public class AttributedURIMarshaller extends AbstractWSAddressingObjectMarshalle
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         ElementSupport.appendTextContent(domElement, attributedURI.getValue());
     }
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         XMLObjectSupport.marshallAttributeMap(attributedURI.getUnknownAttributes(), domElement);
     }
 }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIUnmarshaller.java
index 80cdb58..6cb3192 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedURIUnmarshaller.java
@@ -32,14 +32,14 @@ public class AttributedURIUnmarshaller extends AbstractWSAddressingObjectUnmarsh
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         if (elementContent != null) {
-            AttributedURI attributedURI = (AttributedURI) xmlObject;
+            final AttributedURI attributedURI = (AttributedURI) xmlObject;
             attributedURI.setValue(elementContent);
         }
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(attributedURI.getUnknownAttributes(), attribute);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongMarshaller.java
index e15dba8..e34e32b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongMarshaller.java
@@ -32,14 +32,14 @@ public class AttributedUnsignedLongMarshaller extends AbstractWSAddressingObject
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
+        final AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
         XMLObjectSupport.marshallAttributeMap(aul.getUnknownAttributes(), domElement);
     }
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
+        final AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
         if (aul.getValue() != null) {
             ElementSupport.appendTextContent(domElement, aul.getValue().toString());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongUnmarshaller.java
index d0b2d5d..f3dc5b9 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/AttributedUnsignedLongUnmarshaller.java
@@ -30,13 +30,13 @@ public class AttributedUnsignedLongUnmarshaller extends AbstractWSAddressingObje
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
+        final AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(aul.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
+        final AttributedUnsignedLong aul = (AttributedUnsignedLong) xmlObject;
         if (elementContent != null) {
             aul.setValue(Long.valueOf(elementContent.trim()));
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeImpl.java
index 1010f91..1d2ad4e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeImpl.java
@@ -113,7 +113,7 @@ public class EndpointReferenceTypeImpl extends AbstractWSAddressingObject implem
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (address != null) {
             children.add(address);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeMarshaller.java
index 2bbc279..9d4d3c8 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeMarshaller.java
@@ -31,7 +31,7 @@ public class EndpointReferenceTypeMarshaller extends AbstractWSAddressingObjectM
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        EndpointReferenceType eprType = (EndpointReferenceType) xmlObject;
+        final EndpointReferenceType eprType = (EndpointReferenceType) xmlObject;
         XMLObjectSupport.marshallAttributeMap(eprType.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeUnmarshaller.java
index 29a3e8a..e3b2e9b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/EndpointReferenceTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class EndpointReferenceTypeUnmarshaller extends AbstractWSAddressingObjec
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
         throws UnmarshallingException {
-        EndpointReferenceType epr = (EndpointReferenceType) parentXMLObject;
+        final EndpointReferenceType epr = (EndpointReferenceType) parentXMLObject;
         if (childXMLObject instanceof Address) {
             epr.setAddress((Address) childXMLObject);
         } else if (childXMLObject instanceof Metadata) {
@@ -49,7 +49,7 @@ public class EndpointReferenceTypeUnmarshaller extends AbstractWSAddressingObjec
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        EndpointReferenceType epr = (EndpointReferenceType) xmlObject;
+        final EndpointReferenceType epr = (EndpointReferenceType) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(epr.getUnknownAttributes(), attribute);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataImpl.java
index 39c6168..1a81f05 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataImpl.java
@@ -70,7 +70,7 @@ public class MetadataImpl extends AbstractWSAddressingObject implements Metadata
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataMarshaller.java
index 9cf1ba1..a0421e4 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataMarshaller.java
@@ -32,7 +32,7 @@ public class MetadataMarshaller extends AbstractWSAddressingObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Metadata metadata = (Metadata) xmlObject;
+        final Metadata metadata = (Metadata) xmlObject;
         XMLObjectSupport.marshallAttributeMap(metadata.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataUnmarshaller.java
index 3779a96..2b1ef51 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/MetadataUnmarshaller.java
@@ -31,14 +31,14 @@ public class MetadataUnmarshaller extends AbstractWSAddressingObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Metadata metadata = (Metadata) xmlObject;
+        final Metadata metadata = (Metadata) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(metadata.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Metadata metadata = (Metadata) parentXMLObject;
+        final Metadata metadata = (Metadata) parentXMLObject;
         metadata.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionImpl.java
index 3359a46..786a156 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionImpl.java
@@ -80,7 +80,7 @@ public class ProblemActionImpl extends AbstractWSAddressingObject implements Pro
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (action != null) {
             children.add(action);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionMarshaller.java
index d3a4a45..4fd771d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionMarshaller.java
@@ -30,7 +30,7 @@ public class ProblemActionMarshaller extends AbstractWSAddressingObjectMarshalle
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ProblemAction pa = (ProblemAction) xmlObject;
+        final ProblemAction pa = (ProblemAction) xmlObject;
         XMLObjectSupport.marshallAttributeMap(pa.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionUnmarshaller.java
index 9786079..8482524 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ProblemActionUnmarshaller.java
@@ -32,14 +32,14 @@ public class ProblemActionUnmarshaller extends AbstractWSAddressingObjectUnmarsh
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        ProblemAction pa = (ProblemAction) xmlObject;
+        final ProblemAction pa = (ProblemAction) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(pa.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ProblemAction pa = (ProblemAction) parentXMLObject;
+        final ProblemAction pa = (ProblemAction) parentXMLObject;
         
         if (childXMLObject instanceof Action) {
             pa.setAction((Action) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersImpl.java
index ea936db..c030d64 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersImpl.java
@@ -71,7 +71,7 @@ public class ReferenceParametersImpl extends AbstractWSAddressingObject implemen
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersMarshaller.java
index 6cba8ce..8e0c649 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersMarshaller.java
@@ -32,7 +32,7 @@ public class ReferenceParametersMarshaller extends AbstractWSAddressingObjectMar
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ReferenceParameters rp = (ReferenceParameters) xmlObject;
+        final ReferenceParameters rp = (ReferenceParameters) xmlObject;
         XMLObjectSupport.marshallAttributeMap(rp.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersUnmarshaller.java
index 6fc4021..c5fc070 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/ReferenceParametersUnmarshaller.java
@@ -31,14 +31,14 @@ public class ReferenceParametersUnmarshaller extends AbstractWSAddressingObjectU
     
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        ReferenceParameters rp = (ReferenceParameters) xmlObject;
+        final ReferenceParameters rp = (ReferenceParameters) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(rp.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ReferenceParameters rp = (ReferenceParameters) parentXMLObject;
+        final ReferenceParameters rp = (ReferenceParameters) parentXMLObject;
         rp.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
index 1bbd018..bae5cb3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
@@ -33,9 +33,9 @@ public class RelatesToMarshaller extends XSURIMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RelatesTo relatesTo = (RelatesTo) xmlObject;
+        final RelatesTo relatesTo = (RelatesTo) xmlObject;
         
-        String relationshipType = StringSupport.trimOrNull(relatesTo.getRelationshipType());
+        final String relationshipType = StringSupport.trimOrNull(relatesTo.getRelationshipType());
         if (relationshipType != null) {
             domElement.setAttributeNS(null, RelatesTo.RELATIONSHIP_TYPE_ATTRIB_NAME, relationshipType);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
index 5fada1f..c624099 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
@@ -33,7 +33,7 @@ public class RelatesToUnmarshaller extends XSURIUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RelatesTo relatesTo = (RelatesTo) xmlObject;
+        final RelatesTo relatesTo = (RelatesTo) xmlObject;
         
         if (RelatesTo.RELATIONSHIP_TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             relatesTo.setRelationshipType(StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
index 886b76b..420da3b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
@@ -113,9 +113,9 @@ public class AddActionHandler extends AbstractHeaderGeneratingMessageHandler {
             return false;
         }
         
-        WSAddressingContext addressingContext = messageContext.getSubcontext(WSAddressingContext.class);
+        final WSAddressingContext addressingContext = messageContext.getSubcontext(WSAddressingContext.class);
         
-        Fault fault = SOAPMessagingSupport.getSOAP11Fault(messageContext);
+        final Fault fault = SOAPMessagingSupport.getSOAP11Fault(messageContext);
         if (fault != null) {
             log.debug("Saw SOAP Fault registered in message context, selecting Fault Action URI");
             if (addressingContext != null && addressingContext.getFaultActionURI() != null) {
@@ -162,7 +162,7 @@ public class AddActionHandler extends AbstractHeaderGeneratingMessageHandler {
     /** {@inheritDoc} */
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
         log.debug("Issuing WS-Addressing Action header with URI value: {}", sendURI);
-        Action action = (Action) XMLObjectSupport.buildXMLObject(Action.ELEMENT_NAME);
+        final Action action = (Action) XMLObjectSupport.buildXMLObject(Action.ELEMENT_NAME);
         action.setValue(sendURI);
         decorateGeneratedHeader(messageContext, action);
         SOAPMessagingSupport.addHeaderBlock(messageContext, action);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
index 351e12e..5f2043b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
@@ -75,9 +75,9 @@ public class AddMessageIDHandler extends AbstractHeaderGeneratingMessageHandler
 
     /** {@inheritDoc} */
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
-        String id = getMessageID(messageContext);
+        final String id = getMessageID(messageContext);
         log.debug("Issuing WS-Addressing MessageID: {}", id);
-        MessageID messageID = (MessageID) XMLObjectSupport.buildXMLObject(MessageID.ELEMENT_NAME);
+        final MessageID messageID = (MessageID) XMLObjectSupport.buildXMLObject(MessageID.ELEMENT_NAME);
         messageID.setValue(id);
         decorateGeneratedHeader(messageContext, messageID);
         SOAPMessagingSupport.addHeaderBlock(messageContext, messageID);
@@ -91,7 +91,7 @@ public class AddMessageIDHandler extends AbstractHeaderGeneratingMessageHandler
      * @return the retrieved or generated message ID
      */
     @Nonnull protected String getMessageID(final MessageContext messageContext) {
-        WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
+        final WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
         if (addressing != null && addressing.getMessageIDURI() != null) {
             return addressing.getMessageIDURI();
         } else if (getIdentifierGenerationStrategy() != null) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
index 8829ce1..b50539e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
@@ -96,7 +96,7 @@ public class AddRelatesToHandler extends AbstractHeaderGeneratingMessageHandler
             return false;
         }
         
-        WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
+        final WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
         if (addressing != null) {
             relatesToURI = addressing.getRelatesToURI();
             if (relationshipType == null) {
@@ -119,7 +119,7 @@ public class AddRelatesToHandler extends AbstractHeaderGeneratingMessageHandler
     protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
         log.debug("Issuing WS-Addressing RelatesTo header with URI '{}' and RelationshipType '{}'", 
                 relatesToURI, relationshipType);
-        RelatesTo relatesTo = (RelatesTo) XMLObjectSupport.buildXMLObject(RelatesTo.ELEMENT_NAME);
+        final RelatesTo relatesTo = (RelatesTo) XMLObjectSupport.buildXMLObject(RelatesTo.ELEMENT_NAME);
         relatesTo.setValue(relatesToURI);
         relatesTo.setRelationshipType(relationshipType);
         decorateGeneratedHeader(messageContext, relatesTo);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
index ff78de7..d867fab 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
@@ -48,8 +48,8 @@ public class ExtractMessageIDHandler extends AbstractMessageHandler {
 
     /** {@inheritDoc} */
     protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
-        MessageID header = getMessageID(messageContext);
-        String headerValue = header != null ? StringSupport.trimOrNull(header.getValue()) : null;
+        final MessageID header = getMessageID(messageContext);
+        final String headerValue = header != null ? StringSupport.trimOrNull(header.getValue()) : null;
         log.debug("Extracted inbound WS-Addressing MessageID value: {}", headerValue);
         if (header != null && headerValue != null) {
             messageContext.getSubcontext(WSAddressingContext.class, true).setMessageIDURI(headerValue);
@@ -64,7 +64,8 @@ public class ExtractMessageIDHandler extends AbstractMessageHandler {
      * @return the message MessageID URI value
      */
     protected MessageID getMessageID(@Nonnull final MessageContext messageContext) {
-        List<XMLObject> messageIDs = SOAPMessagingSupport.getInboundHeaderBlock(messageContext, MessageID.ELEMENT_NAME);
+        final List<XMLObject> messageIDs =
+                SOAPMessagingSupport.getInboundHeaderBlock(messageContext, MessageID.ELEMENT_NAME);
         if (messageIDs != null && !messageIDs.isEmpty()) {
             return (MessageID) messageIDs.get(0);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
index 2668928..1cca0c5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
@@ -81,7 +81,7 @@ public class ValidateActionHandler extends AbstractMessageHandler {
         }
         
         // A non-null subcontext value will override what is statically configured
-        WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
+        final WSAddressingContext addressing = messageContext.getSubcontext(WSAddressingContext.class, false);
         if (addressing != null && addressing.getActionURI() != null) {
             expectedActionURI = addressing.getActionURI();
         }
@@ -94,8 +94,8 @@ public class ValidateActionHandler extends AbstractMessageHandler {
 
     /** {@inheritDoc} */
     protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
-        Action header = getAction(messageContext);
-        String headerValue = header != null ? StringSupport.trimOrNull(header.getValue()) : null;
+        final Action header = getAction(messageContext);
+        final String headerValue = header != null ? StringSupport.trimOrNull(header.getValue()) : null;
         log.debug("Checking inbound message WS-Addressing Action URI value: {}", headerValue);
         if (Objects.equals(getExpectedActionURI(), headerValue)) {
             log.debug("Inbound WS-Addressing Action URI matched expected value");
@@ -117,7 +117,7 @@ public class ValidateActionHandler extends AbstractMessageHandler {
      * @return the message Action header
      */
     protected Action getAction(@Nonnull final MessageContext messageContext) {
-        List<XMLObject> actions = SOAPMessagingSupport.getInboundHeaderBlock(messageContext, Action.ELEMENT_NAME);
+        final List<XMLObject> actions = SOAPMessagingSupport.getInboundHeaderBlock(messageContext, Action.ELEMENT_NAME);
         if (actions != null && !actions.isEmpty()) {
             return (Action) actions.get(0);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressMarshaller.java
index 295bbd1..5c5c578 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressMarshaller.java
@@ -34,7 +34,7 @@ public class AddressMarshaller extends AbstractXMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject fedObject, final Element domElement) {
-        Address address = (Address) fedObject;
+        final Address address = (Address) fedObject;
 
         if (address.getValue() != null) {
             ElementSupport.appendTextContent(domElement, address.getValue());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressUnmarshaller.java
index 9ab29d4..558c4b1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AddressUnmarshaller.java
@@ -27,7 +27,7 @@ public class AddressUnmarshaller extends AbstractXMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject fedObject, final String elementContent) {
-        Address address = (Address) fedObject;
+        final Address address = (Address) fedObject;
         address.setValue(elementContent);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToImpl.java
index 6e650d7..816bf38 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToImpl.java
@@ -55,7 +55,7 @@ public class AppliesToImpl extends AbstractXMLObject implements AppliesTo {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(endPointReference);
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToUnmarshaller.java
index 68086e5..0ff24c2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/AppliesToUnmarshaller.java
@@ -29,7 +29,7 @@ public class AppliesToUnmarshaller extends AbstractXMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentFedObject, final XMLObject childFedObject) {
 
-        AppliesTo appliesTo = (AppliesTo) parentFedObject;
+        final AppliesTo appliesTo = (AppliesTo) parentFedObject;
 
         if (childFedObject instanceof EndPointReference) {
             appliesTo.setEndPointReference((EndPointReference) childFedObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceImpl.java
index 788ec94..76a1557 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceImpl.java
@@ -57,7 +57,7 @@ public class EndPointReferenceImpl extends AbstractXMLObject implements EndPoint
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(address);
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceUnmarshaller.java
index 812236c..7f27221 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/EndPointReferenceUnmarshaller.java
@@ -28,7 +28,7 @@ public class EndPointReferenceUnmarshaller extends AbstractXMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) {
-        EndPointReference endPointReference = (EndPointReference) parentSAMLObject;
+        final EndPointReference endPointReference = (EndPointReference) parentSAMLObject;
 
         if (childSAMLObject instanceof Address) {
             endPointReference.setAddress((Address) childSAMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseImpl.java
index 5ee1dae..cdbeccc 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseImpl.java
@@ -67,7 +67,7 @@ public class RequestSecurityTokenResponseImpl extends AbstractXMLObject implemen
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>(1 + requestedSecurityTokens.size());
+        final ArrayList<XMLObject> children = new ArrayList<>(1 + requestedSecurityTokens.size());
 
         children.addAll(requestedSecurityTokens);
         children.add(appliesTo);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseUnmarshaller.java
index 1616b8c..a64b49d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestSecurityTokenResponseUnmarshaller.java
@@ -29,7 +29,7 @@ public class RequestSecurityTokenResponseUnmarshaller extends AbstractXMLObjectU
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) {
-        RequestSecurityTokenResponse response = (RequestSecurityTokenResponse) parentSAMLObject;
+        final RequestSecurityTokenResponse response = (RequestSecurityTokenResponse) parentSAMLObject;
 
         if (childSAMLObject instanceof RequestedSecurityToken) {
             response.getRequestedSecurityToken().add((RequestedSecurityToken) childSAMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenImpl.java
index 22d665d..3b0036b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenImpl.java
@@ -52,7 +52,7 @@ public class RequestedSecurityTokenImpl extends AbstractXMLObject implements Req
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>(1 + tokens.size());
+        final ArrayList<XMLObject> children = new ArrayList<>(1 + tokens.size());
 
         children.addAll(tokens);
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenUnmarshaller.java
index c524934..e88adc6 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsfed/impl/RequestedSecurityTokenUnmarshaller.java
@@ -27,7 +27,7 @@ public class RequestedSecurityTokenUnmarshaller extends AbstractXMLObjectUnmarsh
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) {
-        RequestedSecurityToken requestedSecurityToken = (RequestedSecurityToken) parentSAMLObject;
+        final RequestedSecurityToken requestedSecurityToken = (RequestedSecurityToken) parentSAMLObject;
         requestedSecurityToken.getSecurityTokens().add(childSAMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToImpl.java
index 6a82ffe..3809fdf 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToImpl.java
@@ -70,7 +70,7 @@ public class AppliesToImpl extends AbstractWSPolicyObject implements AppliesTo {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToMarshaller.java
index f4ece0a..0c712bd 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToMarshaller.java
@@ -32,7 +32,7 @@ public class AppliesToMarshaller extends AbstractWSPolicyObjectMarshaller {
     
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AppliesTo at = (AppliesTo) xmlObject;
+        final AppliesTo at = (AppliesTo) xmlObject;
         XMLObjectSupport.marshallAttributeMap(at.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToUnmarshaller.java
index d6bbf97..5dc0a81 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/AppliesToUnmarshaller.java
@@ -31,14 +31,14 @@ public class AppliesToUnmarshaller extends AbstractWSPolicyObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AppliesTo at = (AppliesTo) xmlObject;
+        final AppliesTo at = (AppliesTo) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(at.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        AppliesTo at = (AppliesTo) parentXMLObject;
+        final AppliesTo at = (AppliesTo) parentXMLObject;
         at.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeImpl.java
index feef06c..0bdcf7c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeImpl.java
@@ -84,7 +84,7 @@ public class OperatorContentTypeImpl extends AbstractWSPolicyObject implements O
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(xmlObjects);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeUnmarshaller.java
index 417ede6..71a8eb5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/OperatorContentTypeUnmarshaller.java
@@ -29,7 +29,7 @@ public class OperatorContentTypeUnmarshaller extends AbstractWSPolicyObjectUnmar
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject) 
             throws UnmarshallingException {
-        OperatorContentType oct = (OperatorContentType) parentXMLObject;
+        final OperatorContentType oct = (OperatorContentType) parentXMLObject;
         oct.getXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentImpl.java
index 06f28c6..c0c494f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentImpl.java
@@ -100,7 +100,7 @@ public class PolicyAttachmentImpl extends AbstractWSPolicyObject implements Poli
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (appliesTo != null) {
             children.add(appliesTo);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentMarshaller.java
index 6b84d99..f3c3fc1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentMarshaller.java
@@ -30,7 +30,7 @@ public class PolicyAttachmentMarshaller extends AbstractWSPolicyObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicyAttachment pa = (PolicyAttachment) xmlObject;
+        final PolicyAttachment pa = (PolicyAttachment) xmlObject;
         XMLObjectSupport.marshallAttributeMap(pa.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentUnmarshaller.java
index 36c476b..e4d4f3c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyAttachmentUnmarshaller.java
@@ -33,14 +33,14 @@ public class PolicyAttachmentUnmarshaller extends AbstractWSPolicyObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        PolicyAttachment pa = (PolicyAttachment) xmlObject;
+        final PolicyAttachment pa = (PolicyAttachment) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(pa.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        PolicyAttachment pa = (PolicyAttachment) parentXMLObject;
+        final PolicyAttachment pa = (PolicyAttachment) parentXMLObject;
         
         if (childXMLObject instanceof AppliesTo) {
             pa.setAppliesTo((AppliesTo) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyImpl.java
index 0db902a..096c67c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyImpl.java
@@ -66,7 +66,7 @@ public class PolicyImpl extends OperatorContentTypeImpl implements Policy {
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyMarshaller.java
index 683ff1c..a4499e1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyMarshaller.java
@@ -33,7 +33,7 @@ public class PolicyMarshaller extends OperatorContentTypeMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Policy policy = (Policy) xmlObject;
+        final Policy policy = (Policy) xmlObject;
         
         if (policy.getName() != null) {
             domElement.setAttributeNS(null, Policy.NAME_ATTRIB_NAME, policy.getName());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceMarshaller.java
index 9a05984..2e4bf39 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceMarshaller.java
@@ -31,7 +31,7 @@ public class PolicyReferenceMarshaller extends AbstractWSPolicyObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicyReference pr = (PolicyReference) xmlObject;
+        final PolicyReference pr = (PolicyReference) xmlObject;
         
         if (pr.getURI() != null) {
             domElement.setAttributeNS(null, PolicyReference.URI_ATTRIB_NAME, pr.getURI());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceUnmarshaller.java
index 1a4cc37..726fe63 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyReferenceUnmarshaller.java
@@ -35,13 +35,13 @@ public class PolicyReferenceUnmarshaller extends AbstractWSPolicyObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        PolicyReference pr = (PolicyReference) xmlObject;
+        final PolicyReference pr = (PolicyReference) xmlObject;
 
-        QName uriName = new QName(PolicyReference.URI_ATTRIB_NAME);
-        QName digestName = new QName(PolicyReference.DIGEST_ATTRIB_NAME);
-        QName digestAlgorithmName = new QName(PolicyReference.DIGEST_ALGORITHM_ATTRIB_NAME);
+        final QName uriName = new QName(PolicyReference.URI_ATTRIB_NAME);
+        final QName digestName = new QName(PolicyReference.DIGEST_ATTRIB_NAME);
+        final QName digestAlgorithmName = new QName(PolicyReference.DIGEST_ALGORITHM_ATTRIB_NAME);
 
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute .getPrefix());
 
         if (uriName.equals(attribQName)) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyUnmarshaller.java
index 49a6dfb..10b9894 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wspolicy/impl/PolicyUnmarshaller.java
@@ -37,11 +37,11 @@ public class PolicyUnmarshaller extends OperatorContentTypeUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Policy policy = (Policy) xmlObject;
+        final Policy policy = (Policy) xmlObject;
         
-        QName nameQName = new QName(Policy.NAME_ATTRIB_NAME);
+        final QName nameQName = new QName(Policy.NAME_ATTRIB_NAME);
         
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         
         if (nameQName.equals(attribQName)) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
index da345a3..9e4e85c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeImpl.java
@@ -68,7 +68,7 @@ public class AttributedDateTimeImpl extends AbstractWSSecurityObject implements
     /** {@inheritDoc} */
     public void setDateTime(final DateTime newDateTime) {
         dateTimeValue = newDateTime;
-        String formattedDateTime = formatter.print(dateTimeValue);
+        final String formattedDateTime = formatter.print(dateTimeValue);
         stringValue = prepareForAssignment(stringValue, formattedDateTime);
     }
 
@@ -90,7 +90,7 @@ public class AttributedDateTimeImpl extends AbstractWSSecurityObject implements
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldID = id;
+        final String oldID = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldID, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeMarshaller.java
index 73fb873..40f813c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeMarshaller.java
@@ -35,7 +35,7 @@ public class AttributedDateTimeMarshaller extends AbstractWSSecurityObjectMarsha
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
+        final AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
         
         if (!Strings.isNullOrEmpty(dateTime.getWSUId())) {
             XMLObjectSupport.marshallAttribute(AttributedDateTime.WSU_ID_ATTR_NAME, dateTime.getWSUId(), domElement,
@@ -49,7 +49,7 @@ public class AttributedDateTimeMarshaller extends AbstractWSSecurityObjectMarsha
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
+        final AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
         ElementSupport.appendTextContent(domElement, dateTime.getValue());
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeUnmarshaller.java
index 3dbfaf7..10f87f0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedDateTimeUnmarshaller.java
@@ -37,9 +37,9 @@ public class AttributedDateTimeUnmarshaller extends AbstractWSSecurityObjectUnma
     
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
+        final AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
         
-        QName attrName =
+        final QName attrName =
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (AttributedDateTime.WSU_ID_ATTR_NAME.equals(attrName)) {
             dateTime.setWSUId(attribute.getValue());
@@ -51,7 +51,7 @@ public class AttributedDateTimeUnmarshaller extends AbstractWSSecurityObjectUnma
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
+        final AttributedDateTime dateTime = (AttributedDateTime) xmlObject;
         if (!Strings.isNullOrEmpty(elementContent)) {
             dateTime.setValue(elementContent);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringImpl.java
index 592595c..a4c0aa2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringImpl.java
@@ -65,7 +65,7 @@ public class AttributedStringImpl extends AbstractWSSecurityObject implements At
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringMarshaller.java
index 579de1a..5e0a108 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringMarshaller.java
@@ -34,7 +34,7 @@ public class AttributedStringMarshaller extends AbstractWSSecurityObjectMarshall
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedString attributedString = (AttributedString) xmlObject;
+        final AttributedString attributedString = (AttributedString) xmlObject;
         
         if (!Strings.isNullOrEmpty(attributedString.getWSUId())) {
             XMLObjectSupport.marshallAttribute(AttributedString.WSU_ID_ATTR_NAME, attributedString.getWSUId(),
@@ -48,7 +48,7 @@ public class AttributedStringMarshaller extends AbstractWSSecurityObjectMarshall
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributedString attributedString = (AttributedString) xmlObject;
+        final AttributedString attributedString = (AttributedString) xmlObject;
         ElementSupport.appendTextContent(domElement, attributedString.getValue());
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringUnmarshaller.java
index d806a94..9d5f938 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedStringUnmarshaller.java
@@ -34,9 +34,9 @@ public class AttributedStringUnmarshaller extends AbstractWSSecurityObjectUnmars
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedString attributedString = (AttributedString) xmlObject;
+        final AttributedString attributedString = (AttributedString) xmlObject;
         
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (AttributedString.WSU_ID_ATTR_NAME.equals(attribQName)) {
             attributedString.setWSUId(attribute.getValue());
@@ -48,7 +48,7 @@ public class AttributedStringUnmarshaller extends AbstractWSSecurityObjectUnmars
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributedString attributedString = (AttributedString) xmlObject;
+        final AttributedString attributedString = (AttributedString) xmlObject;
         attributedString.setValue(elementContent);
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIImpl.java
index 5eddaad..ed4b1a7 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIImpl.java
@@ -64,7 +64,7 @@ public class AttributedURIImpl extends AbstractWSSecurityObject implements Attri
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIMarshaller.java
index 087396f..6494634 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIMarshaller.java
@@ -34,7 +34,7 @@ public class AttributedURIMarshaller extends AbstractWSSecurityObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         
         if (!Strings.isNullOrEmpty(attributedURI.getWSUId())) {
             XMLObjectSupport.marshallAttribute(AttributedURI.WSU_ID_ATTR_NAME, attributedURI.getWSUId(), domElement,
@@ -48,7 +48,7 @@ public class AttributedURIMarshaller extends AbstractWSSecurityObjectMarshaller
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         ElementSupport.appendTextContent(domElement, attributedURI.getValue());
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIUnmarshaller.java
index a038ead..f18ffc5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/AttributedURIUnmarshaller.java
@@ -34,9 +34,9 @@ public class AttributedURIUnmarshaller extends AbstractWSSecurityObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (AttributedURI.WSU_ID_ATTR_NAME.equals(attribQName)) {
             attributedURI.setWSUId(attribute.getValue());
@@ -48,7 +48,7 @@ public class AttributedURIUnmarshaller extends AbstractWSSecurityObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributedURI attributedURI = (AttributedURI) xmlObject;
+        final AttributedURI attributedURI = (AttributedURI) xmlObject;
         attributedURI.setValue(elementContent);
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenMarshaller.java
index c1d6938..d926e8b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenMarshaller.java
@@ -31,7 +31,7 @@ public class BinarySecurityTokenMarshaller extends EncodedStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        BinarySecurityToken token = (BinarySecurityToken) xmlObject;
+        final BinarySecurityToken token = (BinarySecurityToken) xmlObject;
         if (!Strings.isNullOrEmpty(token.getValueType())) {
             domElement.setAttributeNS(null, BinarySecurityToken.ENCODING_TYPE_ATTRIB_NAME, token.getValueType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenUnmarshaller.java
index 74f60b7..688fe1b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/BinarySecurityTokenUnmarshaller.java
@@ -29,7 +29,7 @@ public class BinarySecurityTokenUnmarshaller extends EncodedStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        BinarySecurityToken token = (BinarySecurityToken) xmlObject;
+        final BinarySecurityToken token = (BinarySecurityToken) xmlObject;
         if (BinarySecurityToken.VALUE_TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             token.setValueType(attribute.getValue());
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedImpl.java
index b439b50..3498481 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedImpl.java
@@ -83,7 +83,7 @@ public class EmbeddedImpl extends AbstractWSSecurityObject implements Embedded {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedMarshaller.java
index c3b0518..d8f080d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedMarshaller.java
@@ -33,7 +33,7 @@ public class EmbeddedMarshaller extends AbstractWSSecurityObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Embedded embedded = (Embedded) xmlObject;
+        final Embedded embedded = (Embedded) xmlObject;
         if (!Strings.isNullOrEmpty(embedded.getValueType())) {
             domElement.setAttributeNS(null, Embedded.VALUE_TYPE_ATTRIB_NAME, embedded.getValueType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedUnmarshaller.java
index 8bf31c7..6a300f2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EmbeddedUnmarshaller.java
@@ -31,8 +31,8 @@ public class EmbeddedUnmarshaller extends AbstractWSSecurityObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Embedded embedded = (Embedded) xmlObject;
-        String attrName = attribute.getLocalName();
+        final Embedded embedded = (Embedded) xmlObject;
+        final String attrName = attribute.getLocalName();
         if (Embedded.VALUE_TYPE_ATTRIB_NAME.equals(attrName)) {
             embedded.setValueType(attribute.getValue());
         } else {
@@ -43,7 +43,7 @@ public class EmbeddedUnmarshaller extends AbstractWSSecurityObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Embedded embedded = (Embedded) parentXMLObject;
+        final Embedded embedded = (Embedded) parentXMLObject;
         embedded.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringMarshaller.java
index 9ecd9fe..53e64f1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringMarshaller.java
@@ -31,7 +31,7 @@ public class EncodedStringMarshaller extends AttributedStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        EncodedString encodedString = (EncodedString) xmlObject;
+        final EncodedString encodedString = (EncodedString) xmlObject;
         if (!Strings.isNullOrEmpty(encodedString.getEncodingType())){
             domElement.setAttributeNS(null, EncodedString.ENCODING_TYPE_ATTRIB_NAME, encodedString.getEncodingType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringUnmarshaller.java
index ce2051d..c6f48b0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncodedStringUnmarshaller.java
@@ -29,7 +29,7 @@ public class EncodedStringUnmarshaller extends AttributedStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        EncodedString encodedString= (EncodedString) xmlObject;
+        final EncodedString encodedString= (EncodedString) xmlObject;
         if (EncodedString.ENCODING_TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             encodedString.setEncodingType(attribute.getValue());
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderImpl.java
index 7047abe..5a9a238 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderImpl.java
@@ -86,7 +86,7 @@ public class EncryptedHeaderImpl extends AbstractWSSecurityObject implements Enc
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = wsuId;
+        final String oldId = wsuId;
         wsuId = prepareForAssignment(wsuId, newId);
         registerOwnID(oldId, wsuId);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, wsuId != null);
@@ -208,7 +208,7 @@ public class EncryptedHeaderImpl extends AbstractWSSecurityObject implements Enc
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        LazyList<XMLObject> children = new LazyList<>();
+        final LazyList<XMLObject> children = new LazyList<>();
         if (encryptedData != null) {
             children.add(encryptedData);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderMarshaller.java
index 3772e7e..fcdea54 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderMarshaller.java
@@ -30,7 +30,7 @@ public class EncryptedHeaderMarshaller extends AbstractWSSecurityObjectMarshalle
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        EncryptedHeader eh = (EncryptedHeader) xmlObject;
+        final EncryptedHeader eh = (EncryptedHeader) xmlObject;
         
         if (eh.getWSUId() != null) {
             XMLObjectSupport.marshallAttribute(EncryptedHeader.WSU_ID_ATTR_NAME, 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderUnmarshaller.java
index bcbb751..77661d1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/EncryptedHeaderUnmarshaller.java
@@ -35,8 +35,8 @@ public class EncryptedHeaderUnmarshaller extends AbstractWSSecurityObjectUnmarsh
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        EncryptedHeader eh = (EncryptedHeader) xmlObject;
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final EncryptedHeader eh = (EncryptedHeader) xmlObject;
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (EncryptedHeader.WSU_ID_ATTR_NAME.equals(attrName)) {
             eh.setWSUId(attribute.getValue());
             attribute.getOwnerElement().setIdAttributeNode(attribute, true);
@@ -58,7 +58,7 @@ public class EncryptedHeaderUnmarshaller extends AbstractWSSecurityObjectUnmarsh
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        EncryptedHeader eh = (EncryptedHeader) parentXMLObject;
+        final EncryptedHeader eh = (EncryptedHeader) parentXMLObject;
         if (childXMLObject instanceof EncryptedData) {
             eh.setEncryptedData((EncryptedData) childXMLObject);
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationMarshaller.java
index 2fd2395..f01372f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationMarshaller.java
@@ -34,7 +34,7 @@ public class IterationMarshaller extends AbstractWSSecurityObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        Iteration iteration = (Iteration) xmlObject;
+        final Iteration iteration = (Iteration) xmlObject;
         
         if (iteration.getValue() != null) {
             ElementSupport.appendTextContent(domElement, iteration.getValue().toString());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationUnmarshaller.java
index aa57ff0..85e751c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/IterationUnmarshaller.java
@@ -29,7 +29,7 @@ public class IterationUnmarshaller extends AbstractWSSecurityObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        Iteration iteration = (Iteration) xmlObject;
+        final Iteration iteration = (Iteration) xmlObject;
         if (elementContent != null) {
             iteration.setValue(Integer.valueOf(elementContent));
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierMarshaller.java
index 92c886b..108053b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierMarshaller.java
@@ -33,7 +33,7 @@ public class KeyIdentifierMarshaller extends EncodedStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        KeyIdentifier keyIdentifier = (KeyIdentifier) xmlObject;
+        final KeyIdentifier keyIdentifier = (KeyIdentifier) xmlObject;
         if (!Strings.isNullOrEmpty(keyIdentifier.getValueType())) {
             domElement.setAttributeNS(null, KeyIdentifier.VALUE_TYPE_ATTRIB_NAME, keyIdentifier.getValueType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierUnmarshaller.java
index fa622a6..2e9f263 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/KeyIdentifierUnmarshaller.java
@@ -30,7 +30,7 @@ public class KeyIdentifierUnmarshaller extends EncodedStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        KeyIdentifier keyIdentifier = (KeyIdentifier) xmlObject;
+        final KeyIdentifier keyIdentifier = (KeyIdentifier) xmlObject;
         if (KeyIdentifier.VALUE_TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             keyIdentifier.setValueType(attribute.getValue());
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordMarshaller.java
index 7fe34be..edab02b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordMarshaller.java
@@ -31,7 +31,7 @@ public class PasswordMarshaller extends AttributedStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Password password = (Password) xmlObject;
+        final Password password = (Password) xmlObject;
         if (!Strings.isNullOrEmpty(password.getType())) {
             domElement.setAttributeNS(null, Password.TYPE_ATTRIB_NAME, password.getType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordUnmarshaller.java
index 5eb7144..870ca7e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/PasswordUnmarshaller.java
@@ -31,7 +31,7 @@ public class PasswordUnmarshaller extends AttributedStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Password password= (Password) xmlObject;
+        final Password password= (Password) xmlObject;
         if (Password.TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             password.setType(attribute.getValue());
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceMarshaller.java
index 752ca8a..1f823e6 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceMarshaller.java
@@ -34,7 +34,7 @@ public class ReferenceMarshaller extends AbstractWSSecurityObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Reference reference = (Reference) xmlObject;
+        final Reference reference = (Reference) xmlObject;
         
         if (!Strings.isNullOrEmpty(reference.getURI())) {
             domElement.setAttributeNS(null, Reference.URI_ATTRIB_NAME, reference.getURI());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceUnmarshaller.java
index 3141709..6d0ffd7 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/ReferenceUnmarshaller.java
@@ -31,8 +31,8 @@ public class ReferenceUnmarshaller extends AbstractWSSecurityObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Reference reference = (Reference) xmlObject;
-        String attrName = attribute.getLocalName();
+        final Reference reference = (Reference) xmlObject;
+        final String attrName = attribute.getLocalName();
         if (Reference.URI_ATTRIB_NAME.equals(attrName)) {
             reference.setURI(attribute.getValue());
         } else if (Reference.VALUE_TYPE_ATTRIB_NAME.equals(attrName)) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltMarshaller.java
index 002c14a..257737f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltMarshaller.java
@@ -33,7 +33,7 @@ public class SaltMarshaller extends AbstractWSSecurityObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        Salt salt = (Salt) xmlObject;
+        final Salt salt = (Salt) xmlObject;
         ElementSupport.appendTextContent(domElement, salt.getValue());
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltUnmarshaller.java
index 25a0681..eacfde5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SaltUnmarshaller.java
@@ -28,7 +28,7 @@ public class SaltUnmarshaller extends AbstractWSSecurityObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        Salt salt = (Salt) xmlObject;
+        final Salt salt = (Salt) xmlObject;
         salt.setValue(elementContent);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityImpl.java
index 56f2fa5..8685f19 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityImpl.java
@@ -70,7 +70,7 @@ public class SecurityImpl extends AbstractWSSecurityObject implements Security {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityMarshaller.java
index bad548a..e83566c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityMarshaller.java
@@ -31,7 +31,7 @@ public class SecurityMarshaller extends AbstractWSSecurityObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Security security = (Security) xmlObject;
+        final Security security = (Security) xmlObject;
         XMLObjectSupport.marshallAttributeMap(security.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceImpl.java
index 9607b19..87c5b5f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceImpl.java
@@ -82,7 +82,7 @@ public class SecurityTokenReferenceImpl extends AbstractWSSecurityObject impleme
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
@@ -106,7 +106,7 @@ public class SecurityTokenReferenceImpl extends AbstractWSSecurityObject impleme
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
 
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceMarshaller.java
index 10c90f3..6a9ec73 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceMarshaller.java
@@ -35,14 +35,14 @@ public class SecurityTokenReferenceMarshaller extends AbstractWSSecurityObjectMa
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SecurityTokenReference str = (SecurityTokenReference) xmlObject;
+        final SecurityTokenReference str = (SecurityTokenReference) xmlObject;
         
         if (!Strings.isNullOrEmpty(str.getWSUId())) {
             XMLObjectSupport.marshallAttribute(SecurityTokenReference.WSU_ID_ATTR_NAME, str.getWSUId(), domElement,
                     true);
         }
         
-        List<String> usages = str.getWSSEUsages();
+        final List<String> usages = str.getWSSEUsages();
         if (usages != null && ! usages.isEmpty()) {
             XMLObjectSupport.marshallAttribute(SecurityTokenReference.WSSE_USAGE_ATTR_NAME, usages, domElement, false);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceUnmarshaller.java
index 59805be..d7919b4 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityTokenReferenceUnmarshaller.java
@@ -36,16 +36,16 @@ public class SecurityTokenReferenceUnmarshaller extends AbstractWSSecurityObject
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        SecurityTokenReference str = (SecurityTokenReference) parentXMLObject;
+        final SecurityTokenReference str = (SecurityTokenReference) parentXMLObject;
 
         str.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        SecurityTokenReference str = (SecurityTokenReference) xmlObject;
+        final SecurityTokenReference str = (SecurityTokenReference) xmlObject;
         
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (SecurityTokenReference.WSU_ID_ATTR_NAME.equals(attribQName)) {
             str.setWSUId(attribute.getValue());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityUnmarshaller.java
index ce5e68e..d813941 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SecurityUnmarshaller.java
@@ -31,14 +31,14 @@ public class SecurityUnmarshaller extends AbstractWSSecurityObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Security security = (Security) xmlObject;
+        final Security security = (Security) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(security.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Security security = (Security) parentXMLObject;
+        final Security security = (Security) parentXMLObject;
         security.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationImpl.java
index b380f68..3cd7dba 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationImpl.java
@@ -60,7 +60,7 @@ public class SignatureConfirmationImpl extends AbstractWSSecurityObject implemen
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationMarshaller.java
index 0c632ac..1b818d0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationMarshaller.java
@@ -32,7 +32,7 @@ public class SignatureConfirmationMarshaller extends AbstractWSSecurityObjectMar
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SignatureConfirmation sc = (SignatureConfirmation) xmlObject;
+        final SignatureConfirmation sc = (SignatureConfirmation) xmlObject;
         
         if (!Strings.isNullOrEmpty(sc.getWSUId())) {
             XMLObjectSupport.marshallAttribute(SignatureConfirmation.WSU_ID_ATTR_NAME, sc.getWSUId(), domElement, true);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationUnmarshaller.java
index cb0a8d2..fc770de 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/SignatureConfirmationUnmarshaller.java
@@ -33,9 +33,9 @@ public class SignatureConfirmationUnmarshaller extends AbstractWSSecurityObjectU
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        SignatureConfirmation sc = (SignatureConfirmation) xmlObject;
+        final SignatureConfirmation sc = (SignatureConfirmation) xmlObject;
         
-        QName attrName =
+        final QName attrName =
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (SignatureConfirmation.WSU_ID_ATTR_NAME.equals(attrName)) {
             sc.setWSUId(attribute.getValue());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampImpl.java
index 9487eb6..f7d150e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampImpl.java
@@ -92,7 +92,7 @@ public class TimestampImpl extends AbstractWSSecurityObject implements Timestamp
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
@@ -115,7 +115,7 @@ public class TimestampImpl extends AbstractWSSecurityObject implements Timestamp
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (created != null) {
             children.add(created);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampMarshaller.java
index 04b2bd6..63d388b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampMarshaller.java
@@ -33,7 +33,7 @@ public class TimestampMarshaller extends AbstractWSSecurityObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Timestamp timestamp = (Timestamp) xmlObject;
+        final Timestamp timestamp = (Timestamp) xmlObject;
         
         if (!Strings.isNullOrEmpty(timestamp.getWSUId())) {
             XMLObjectSupport.marshallAttribute(Timestamp.WSU_ID_ATTR_NAME, timestamp.getWSUId(), domElement, true);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampUnmarshaller.java
index 8405e84..082e196 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TimestampUnmarshaller.java
@@ -39,7 +39,7 @@ public class TimestampUnmarshaller extends AbstractWSSecurityObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Timestamp timestamp = (Timestamp) parentXMLObject;
+        final Timestamp timestamp = (Timestamp) parentXMLObject;
         
         if (childXMLObject instanceof Created) {
             timestamp.setCreated((Created) childXMLObject);
@@ -52,9 +52,9 @@ public class TimestampUnmarshaller extends AbstractWSSecurityObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Timestamp timestamp = (Timestamp) xmlObject;
+        final Timestamp timestamp = (Timestamp) xmlObject;
         
-        QName attrName =
+        final QName attrName =
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (Timestamp.WSU_ID_ATTR_NAME.equals(attrName)) {
             timestamp.setWSUId(attribute.getValue());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersImpl.java
index da7b6f5..4813f0b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersImpl.java
@@ -71,7 +71,7 @@ public class TransformationParametersImpl extends AbstractWSSecurityObject imple
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (!getUnknownXMLObjects().isEmpty()) {
             children.addAll(getUnknownXMLObjects());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersMarshaller.java
index 9fe4084..3211cac 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersMarshaller.java
@@ -31,7 +31,7 @@ public class TransformationParametersMarshaller extends AbstractWSSecurityObject
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        TransformationParameters tp = (TransformationParameters) xmlObject;
+        final TransformationParameters tp = (TransformationParameters) xmlObject;
         XMLObjectSupport.marshallAttributeMap(tp.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersUnmarshaller.java
index 6724920..4a5cfa5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/TransformationParametersUnmarshaller.java
@@ -31,14 +31,14 @@ public class TransformationParametersUnmarshaller extends AbstractWSSecurityObje
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        TransformationParameters tp = (TransformationParameters) xmlObject;
+        final TransformationParameters tp = (TransformationParameters) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(tp.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        TransformationParameters tp = (TransformationParameters) parentXMLObject;
+        final TransformationParameters tp = (TransformationParameters) parentXMLObject;
         tp.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenImpl.java
index 1be3a50..9ee08d0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenImpl.java
@@ -77,7 +77,7 @@ public class UsernameTokenImpl extends AbstractWSSecurityObject implements Usern
 
     /** {@inheritDoc} */
     public void setWSUId(final String newId) {
-        String oldId = id;
+        final String oldId = id;
         id = prepareForAssignment(id, newId);
         registerOwnID(oldId, id);
         manageQualifiedAttributeNamespace(IdBearing.WSU_ID_ATTR_NAME, id != null);
@@ -100,7 +100,7 @@ public class UsernameTokenImpl extends AbstractWSSecurityObject implements Usern
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (username != null) {
             children.add(username);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenMarshaller.java
index d3e1c8d..8d3101e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenMarshaller.java
@@ -32,7 +32,7 @@ public class UsernameTokenMarshaller extends AbstractWSSecurityObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        UsernameToken usernameToken = (UsernameToken) xmlObject;
+        final UsernameToken usernameToken = (UsernameToken) xmlObject;
         
         if (!Strings.isNullOrEmpty(usernameToken.getWSUId())) {
             XMLObjectSupport.marshallAttribute(UsernameToken.WSU_ID_ATTR_NAME, usernameToken.getWSUId(), domElement,
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenUnmarshaller.java
index ff074e3..66ff0e8 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/impl/UsernameTokenUnmarshaller.java
@@ -36,7 +36,7 @@ public class UsernameTokenUnmarshaller extends AbstractWSSecurityObjectUnmarshal
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        UsernameToken token = (UsernameToken) parentXMLObject;
+        final UsernameToken token = (UsernameToken) parentXMLObject;
         if (childXMLObject instanceof Username) {
             token.setUsername((Username) childXMLObject);
         } else {
@@ -46,9 +46,9 @@ public class UsernameTokenUnmarshaller extends AbstractWSSecurityObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        UsernameToken token = (UsernameToken) xmlObject;
+        final UsernameToken token = (UsernameToken) xmlObject;
         
-        QName attribQName = 
+        final QName attribQName = 
             QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getPrefix());
         if (UsernameToken.WSU_ID_ATTR_NAME.equals(attribQName)) {
             token.setWSUId(attribute.getValue());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
index 03aee28..9bec43e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
@@ -167,18 +167,18 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
     /** {@inheritDoc} */
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
         log.debug("Processing addition of outbound WS-Security Timestamp");
-        Timestamp timestamp = (Timestamp) XMLObjectSupport.buildXMLObject(Timestamp.ELEMENT_NAME);
+        final Timestamp timestamp = (Timestamp) XMLObjectSupport.buildXMLObject(Timestamp.ELEMENT_NAME);
         
         if (createdValue != null) {
             log.debug("WS-Security Timestamp Created value added was: {}", createdValue);
-            Created created = (Created) XMLObjectSupport.buildXMLObject(Created.ELEMENT_NAME);
+            final Created created = (Created) XMLObjectSupport.buildXMLObject(Created.ELEMENT_NAME);
             created.setDateTime(createdValue);
             timestamp.setCreated(created);
         }
             
         if (expiresValue != null) {
             log.debug("WS-Security Timestamp Expires value added was: {}", createdValue);
-            Expires expires = (Expires) XMLObjectSupport.buildXMLObject(Expires.ELEMENT_NAME);
+            final Expires expires = (Expires) XMLObjectSupport.buildXMLObject(Expires.ELEMENT_NAME);
             expires.setDateTime(expiresValue);
             timestamp.setExpires(expires);
         }
@@ -196,7 +196,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
      */
     @Nullable protected DateTime getCreatedValue(@Nonnull final MessageContext messageContext) {
         DateTime value = null;
-        WSSecurityContext security = messageContext.getSubcontext(WSSecurityContext.class, false);
+        final WSSecurityContext security = messageContext.getSubcontext(WSSecurityContext.class, false);
         if (security != null) {
             value = security.getTimestampCreated();
         }
@@ -224,7 +224,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
     @Nullable protected DateTime getExpiresValue(@Nonnull final MessageContext messageContext, 
             @Nullable final DateTime created) {
         DateTime value = null;
-        WSSecurityContext security = messageContext.getSubcontext(WSSecurityContext.class, false);
+        final WSSecurityContext security = messageContext.getSubcontext(WSSecurityContext.class, false);
         if (security != null) {
             value = security.getTimestampExpires();
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorImpl.java
index 2adcbab..3f2c0d3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorImpl.java
@@ -74,7 +74,7 @@ public class AuthenticatorImpl extends AbstractWSTrustObject implements Authenti
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (combinedHash != null) {
             children.add(combinedHash);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorUnmarshaller.java
index cd05123..6b8a255 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/AuthenticatorUnmarshaller.java
@@ -32,7 +32,7 @@ public class AuthenticatorUnmarshaller extends AbstractWSTrustObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject) 
             throws UnmarshallingException {
-        Authenticator authenticator = (Authenticator) parentXMLObject;
+        final Authenticator authenticator = (Authenticator) parentXMLObject;
         
         if (childXMLObject instanceof CombinedHash) {
             authenticator.setCombinedHash((CombinedHash) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
index 4d841f1..1599c9b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
@@ -36,13 +36,13 @@ public class BinaryExchangeMarshaller extends XSStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        BinaryExchange binaryExchange = (BinaryExchange) xmlObject;
+        final BinaryExchange binaryExchange = (BinaryExchange) xmlObject;
         
-        String valueType = StringSupport.trimOrNull(binaryExchange.getValueType());
+        final String valueType = StringSupport.trimOrNull(binaryExchange.getValueType());
         if (valueType != null) {
             domElement.setAttributeNS(null, BinaryExchange.VALUE_TYPE_ATTRIB_NAME, valueType);
         }
-        String encodingType = StringSupport.trimOrNull(binaryExchange.getEncodingType());
+        final String encodingType = StringSupport.trimOrNull(binaryExchange.getEncodingType());
         if (encodingType != null) {
             domElement.setAttributeNS(null, BinaryExchange.ENCODING_TYPE_ATTRIB_NAME, encodingType);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeUnmarshaller.java
index cfb2ace..393c6fe 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeUnmarshaller.java
@@ -34,9 +34,9 @@ public class BinaryExchangeUnmarshaller extends XSStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        BinaryExchange binaryExchange = (BinaryExchange) xmlObject;
+        final BinaryExchange binaryExchange = (BinaryExchange) xmlObject;
         
-        String attrName = attribute.getLocalName();
+        final String attrName = attribute.getLocalName();
         if (BinaryExchange.VALUE_TYPE_ATTRIB_NAME.equals(attrName)) {
             binaryExchange.setValueType(attribute.getValue());
         } else if (BinaryExchange.ENCODING_TYPE_ATTRIB_NAME.equals(attrName)) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretMarshaller.java
index 407df5d..d9d8fa2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretMarshaller.java
@@ -34,7 +34,7 @@ public class BinarySecretMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        BinarySecret bs = (BinarySecret) xmlObject;
+        final BinarySecret bs = (BinarySecret) xmlObject;
         if (bs.getType() != null) {
             domElement.setAttributeNS(null, BinarySecret.TYPE_ATTRIB_NAME, bs.getType());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretUnmarshaller.java
index bde4b56..7b96305 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinarySecretUnmarshaller.java
@@ -32,7 +32,7 @@ public class BinarySecretUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        BinarySecret bs = (BinarySecret) xmlObject;
+        final BinarySecret bs = (BinarySecret) xmlObject;
         if (BinarySecret.TYPE_ATTRIB_NAME.equals(attribute.getLocalName())) {
             bs.setType(attribute.getValue());
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetImpl.java
index 47198ec..ed3d4e8 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetImpl.java
@@ -56,7 +56,7 @@ public class CancelTargetImpl extends AbstractWSTrustObject implements CancelTar
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetUnmarshaller.java
index 1fc5e86..2286c6a 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/CancelTargetUnmarshaller.java
@@ -31,7 +31,7 @@ public class CancelTargetUnmarshaller extends AbstractWSTrustObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        CancelTarget ct = (CancelTarget) parentXMLObject;
+        final CancelTarget ct = (CancelTarget) parentXMLObject;
         ct.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsImpl.java
index 2f41571..bc1a243 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsImpl.java
@@ -84,7 +84,7 @@ public class ClaimsImpl extends AbstractWSTrustObject implements Claims {
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsMarshaller.java
index 1c28ae6..4a387bd 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsMarshaller.java
@@ -32,7 +32,7 @@ public class ClaimsMarshaller extends AbstractWSTrustObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Claims claims = (Claims) xmlObject;
+        final Claims claims = (Claims) xmlObject;
         if (claims.getDialect() != null) {
             domElement.setAttributeNS(null, Claims.DIALECT_ATTRIB_NAME, claims.getDialect());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsUnmarshaller.java
index e53784b..f7b0cbe 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ClaimsUnmarshaller.java
@@ -33,7 +33,7 @@ public class ClaimsUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Claims claims = (Claims) xmlObject;
+        final Claims claims = (Claims) xmlObject;
         if (Claims.DIALECT_ATTRIB_NAME.equals(attribute.getLocalName())) {
             claims.setDialect(attribute.getValue());
         } else {
@@ -44,7 +44,7 @@ public class ClaimsUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Claims claims = (Claims) parentXMLObject;
+        final Claims claims = (Claims) parentXMLObject;
         claims.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableMarshaller.java
index 9c2d355..a718176 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableMarshaller.java
@@ -35,8 +35,8 @@ public class DelegatableMarshaller extends AbstractWSTrustObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        Delegatable delegatable = (Delegatable) xmlObject;
-        XSBooleanValue value= delegatable.getValue();
+        final Delegatable delegatable = (Delegatable) xmlObject;
+        final XSBooleanValue value= delegatable.getValue();
         ElementSupport.appendTextContent(domElement, value.toString());
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableUnmarshaller.java
index 2323e59..82b41c9 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegatableUnmarshaller.java
@@ -31,8 +31,8 @@ public class DelegatableUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         if (elementContent != null) {
-            Delegatable delegatable = (Delegatable) xmlObject;
-            XSBooleanValue value = XSBooleanValue.valueOf(elementContent);
+            final Delegatable delegatable = (Delegatable) xmlObject;
+            final XSBooleanValue value = XSBooleanValue.valueOf(elementContent);
             delegatable.setValue(value);
         }
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToImpl.java
index 1b15bdc..f504810 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToImpl.java
@@ -56,7 +56,7 @@ public class DelegateToImpl extends AbstractWSTrustObject implements DelegateTo
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToUnmarshaller.java
index cc15cd4..5da6927 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/DelegateToUnmarshaller.java
@@ -31,7 +31,7 @@ public class DelegateToUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        DelegateTo delegateTo = (DelegateTo) parentXMLObject;
+        final DelegateTo delegateTo = (DelegateTo) parentXMLObject;
         delegateTo.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionImpl.java
index 7c5193a..58500eb 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionImpl.java
@@ -56,7 +56,7 @@ public class EncryptionImpl extends AbstractWSTrustObject implements Encryption
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionUnmarshaller.java
index e0eb8e2..2d3f396 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EncryptionUnmarshaller.java
@@ -32,7 +32,7 @@ public class EncryptionUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Encryption enc = (Encryption) parentXMLObject;
+        final Encryption enc = (Encryption) parentXMLObject;
         enc.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyImpl.java
index 71a5b99..3981bf2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyImpl.java
@@ -70,7 +70,7 @@ public class EntropyImpl extends AbstractWSTrustObject implements Entropy {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyMarshaller.java
index 8ee7c6e..6938ad6 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyMarshaller.java
@@ -32,7 +32,7 @@ public class EntropyMarshaller extends AbstractWSTrustObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Entropy entropy = (Entropy) xmlObject;
+        final Entropy entropy = (Entropy) xmlObject;
         XMLObjectSupport.marshallAttributeMap(entropy.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyUnmarshaller.java
index 876778a..cc2f0f6 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/EntropyUnmarshaller.java
@@ -33,14 +33,14 @@ public class EntropyUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Claims claims = (Claims) xmlObject;
+        final Claims claims = (Claims) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(claims.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Claims claims = (Claims) parentXMLObject;
+        final Claims claims = (Claims) parentXMLObject;
         claims.getUnknownXMLObjects().add(childXMLObject);
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableMarshaller.java
index ae293c0..aa8f894 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableMarshaller.java
@@ -35,8 +35,8 @@ public class ForwardableMarshaller extends AbstractWSTrustObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        Forwardable forwardable = (Forwardable) xmlObject;
-        XSBooleanValue value= forwardable.getValue();
+        final Forwardable forwardable = (Forwardable) xmlObject;
+        final XSBooleanValue value= forwardable.getValue();
         ElementSupport.appendTextContent(domElement, value.toString());
     }
 }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableUnmarshaller.java
index 8fd0036..8a3f368 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ForwardableUnmarshaller.java
@@ -31,8 +31,8 @@ public class ForwardableUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         if (elementContent != null) {
-            Forwardable forwardable = (Forwardable) xmlObject;
-            XSBooleanValue value = XSBooleanValue.valueOf(elementContent);
+            final Forwardable forwardable = (Forwardable) xmlObject;
+            final XSBooleanValue value = XSBooleanValue.valueOf(elementContent);
             forwardable.setValue(value);
         }
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/KeyExchangeTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/KeyExchangeTokenUnmarshaller.java
index 2cc222f..b3f7b40 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/KeyExchangeTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/KeyExchangeTokenUnmarshaller.java
@@ -31,7 +31,7 @@ public class KeyExchangeTokenUnmarshaller extends AbstractWSTrustObjectUnmarshal
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        KeyExchangeToken ket = (KeyExchangeToken) parentXMLObject;
+        final KeyExchangeToken ket = (KeyExchangeToken) parentXMLObject;
         ket.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeImpl.java
index 9517405..9406011 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeImpl.java
@@ -71,7 +71,7 @@ public class LifetimeImpl extends AbstractWSTrustObject implements Lifetime {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (created != null) {
             children.add(created);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeUnmarshaller.java
index a060b1a..cf4a22d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/LifetimeUnmarshaller.java
@@ -33,7 +33,7 @@ public class LifetimeUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Lifetime lifetime = (Lifetime) parentXMLObject;
+        final Lifetime lifetime = (Lifetime) parentXMLObject;
         if (childXMLObject instanceof Created) {
             lifetime.setCreated((Created) childXMLObject);
         } else if (childXMLObject instanceof Expires) {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfImpl.java
index db4d9ac..6b09c58 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfImpl.java
@@ -60,7 +60,7 @@ public class OnBehalfOfImpl extends AbstractWSTrustObject implements OnBehalfOf
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfUnmarshaller.java
index 2e6fb53..3413983 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/OnBehalfOfUnmarshaller.java
@@ -31,7 +31,7 @@ public class OnBehalfOfUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject) 
             throws UnmarshallingException {
-        OnBehalfOf obo = (OnBehalfOf) parentXMLObject;
+        final OnBehalfOf obo = (OnBehalfOf) parentXMLObject;
         obo.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeImpl.java
index 6b0a498..376e6a3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeImpl.java
@@ -56,7 +56,7 @@ public class ParticipantTypeImpl extends AbstractWSTrustObject implements Partic
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeUnmarshaller.java
index f328f62..fc0ca51 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantTypeUnmarshaller.java
@@ -30,7 +30,7 @@ public class ParticipantTypeUnmarshaller extends AbstractWSTrustObjectUnmarshall
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ParticipantType pt = (ParticipantType) parentXMLObject;
+        final ParticipantType pt = (ParticipantType) parentXMLObject;
         pt.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsImpl.java
index af35208..3fd73f6 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsImpl.java
@@ -84,7 +84,7 @@ public class ParticipantsImpl extends AbstractWSTrustObject implements Participa
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         if (primary != null) {
             children.add(primary);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsUnmarshaller.java
index bb7c35b..ab7ef79 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ParticipantsUnmarshaller.java
@@ -33,7 +33,7 @@ public class ParticipantsUnmarshaller extends AbstractWSTrustObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject) 
             throws UnmarshallingException {
-        Participants participants = (Participants) parentXMLObject;
+        final Participants participants = (Participants) parentXMLObject;
         
         if (childXMLObject instanceof Primary) {
             participants.setPrimary((Primary) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionImpl.java
index 59419af..c1b4813 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionImpl.java
@@ -56,7 +56,7 @@ public class ProofEncryptionImpl extends AbstractWSTrustObject implements ProofE
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionUnmarshaller.java
index 209f965..788584b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ProofEncryptionUnmarshaller.java
@@ -31,7 +31,7 @@ public class ProofEncryptionUnmarshaller extends AbstractWSTrustObjectUnmarshall
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ProofEncryption pe = (ProofEncryption) parentXMLObject;
+        final ProofEncryption pe = (ProofEncryption) parentXMLObject;
         pe.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetImpl.java
index ad245ed..a53e79c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetImpl.java
@@ -56,7 +56,7 @@ public class RenewTargetImpl extends AbstractWSTrustObject implements RenewTarge
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetUnmarshaller.java
index a75e374..95e67c9 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewTargetUnmarshaller.java
@@ -32,7 +32,7 @@ public class RenewTargetUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RenewTarget rt = (RenewTarget) parentXMLObject;
+        final RenewTarget rt = (RenewTarget) parentXMLObject;
         rt.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingMarshaller.java
index 6b6343f..c6665a3 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingMarshaller.java
@@ -31,7 +31,7 @@ public class RenewingMarshaller extends AbstractWSTrustObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Renewing renewing = (Renewing) xmlObject;
+        final Renewing renewing = (Renewing) xmlObject;
         
         if (renewing.isAllowXSBoolean() != null) {
             domElement.setAttributeNS(null, Renewing.ALLOW_ATTRIB_NAME, renewing.isAllowXSBoolean().toString());
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingUnmarshaller.java
index 3f96cce..3f25cc9 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RenewingUnmarshaller.java
@@ -32,7 +32,7 @@ public class RenewingUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        Renewing renewing = (Renewing) xmlObject;
+        final Renewing renewing = (Renewing) xmlObject;
         
         if (attribute.getLocalName().equals(Renewing.ALLOW_ATTRIB_NAME)) {
             renewing.setAllow(XSBooleanValue.valueOf(attribute.getValue()));
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionImpl.java
index 61daa38..a6d375d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionImpl.java
@@ -55,7 +55,7 @@ public class RequestSecurityTokenCollectionImpl extends AbstractWSTrustObject
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         children.addAll(requestSecurityTokens);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionUnmarshaller.java
index 4dbd224..621aae5 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenCollectionUnmarshaller.java
@@ -32,7 +32,7 @@ public class RequestSecurityTokenCollectionUnmarshaller extends AbstractWSTrustO
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestSecurityTokenCollection rstc = (RequestSecurityTokenCollection) parentXMLObject;
+        final RequestSecurityTokenCollection rstc = (RequestSecurityTokenCollection) parentXMLObject;
         if (childXMLObject instanceof RequestSecurityToken) {
             rstc.getRequestSecurityTokens().add((RequestSecurityToken) childXMLObject);
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenImpl.java
index d2bb8b1..8605a6c 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenImpl.java
@@ -84,7 +84,7 @@ public class RequestSecurityTokenImpl extends AbstractWSTrustObject implements R
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenMarshaller.java
index ca950ac..39c86ab 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenMarshaller.java
@@ -31,7 +31,7 @@ public class RequestSecurityTokenMarshaller extends AbstractWSTrustObjectMarshal
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RequestSecurityToken rst = (RequestSecurityToken) xmlObject;
+        final RequestSecurityToken rst = (RequestSecurityToken) xmlObject;
         if (rst.getContext() != null) {
             domElement.setAttributeNS(null, RequestSecurityToken.CONTEXT_ATTRIB_NAME, rst.getContext());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionImpl.java
index 21d413d..ded9120 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionImpl.java
@@ -66,7 +66,7 @@ public class RequestSecurityTokenResponseCollectionImpl extends AbstractWSTrustO
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         children.addAll(requestSecurityTokenResponses);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionMarshaller.java
index 8d15a41..3369213 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionMarshaller.java
@@ -31,7 +31,7 @@ public class RequestSecurityTokenResponseCollectionMarshaller extends AbstractWS
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) xmlObject;
+        final RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) xmlObject;
         XMLObjectSupport.marshallAttributeMap(rstrc.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionUnmarshaller.java
index 78eb9d5..75fe0ae 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseCollectionUnmarshaller.java
@@ -33,14 +33,14 @@ public class RequestSecurityTokenResponseCollectionUnmarshaller extends Abstract
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) xmlObject;
+        final RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(rstrc.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) parentXMLObject;
+        final RequestSecurityTokenResponseCollection rstrc = (RequestSecurityTokenResponseCollection) parentXMLObject;
         if (childXMLObject instanceof RequestSecurityTokenResponse) {
             rstrc.getRequestSecurityTokenResponses().add((RequestSecurityTokenResponse) childXMLObject);
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseImpl.java
index 496f437..7a6abb1 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseImpl.java
@@ -84,7 +84,7 @@ public class RequestSecurityTokenResponseImpl extends AbstractWSTrustObject impl
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(unknownChildren);
         return Collections.unmodifiableList(children);
     }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseMarshaller.java
index e338fd9..8d0dc3d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseMarshaller.java
@@ -31,7 +31,7 @@ public class RequestSecurityTokenResponseMarshaller extends AbstractWSTrustObjec
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RequestSecurityTokenResponse rstr= (RequestSecurityTokenResponse) xmlObject;
+        final RequestSecurityTokenResponse rstr= (RequestSecurityTokenResponse) xmlObject;
         if (rstr.getContext() != null) {
             domElement.setAttributeNS(null, RequestSecurityTokenResponse.CONTEXT_ATTRIB_NAME, rstr.getContext());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseUnmarshaller.java
index 732a6f8..1041b9e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenResponseUnmarshaller.java
@@ -33,7 +33,7 @@ public class RequestSecurityTokenResponseUnmarshaller extends AbstractWSTrustObj
     
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RequestSecurityTokenResponse rstr = (RequestSecurityTokenResponse) xmlObject;
+        final RequestSecurityTokenResponse rstr = (RequestSecurityTokenResponse) xmlObject;
         if (RequestSecurityTokenResponse.CONTEXT_ATTRIB_NAME.equals(attribute.getLocalName())) {
             rstr.setContext(attribute.getValue());
         } else {
@@ -44,7 +44,7 @@ public class RequestSecurityTokenResponseUnmarshaller extends AbstractWSTrustObj
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestSecurityTokenResponse rstr = (RequestSecurityTokenResponse) parentXMLObject;
+        final RequestSecurityTokenResponse rstr = (RequestSecurityTokenResponse) parentXMLObject;
         rstr.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenUnmarshaller.java
index 67d00f6..5287604 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestSecurityTokenUnmarshaller.java
@@ -32,7 +32,7 @@ public class RequestSecurityTokenUnmarshaller extends AbstractWSTrustObjectUnmar
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RequestSecurityToken rst = (RequestSecurityToken) xmlObject;
+        final RequestSecurityToken rst = (RequestSecurityToken) xmlObject;
         if (RequestSecurityToken.CONTEXT_ATTRIB_NAME.equals(attribute.getLocalName())) {
             rst.setContext(attribute.getValue());
         } else {
@@ -43,7 +43,7 @@ public class RequestSecurityTokenUnmarshaller extends AbstractWSTrustObjectUnmar
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestSecurityToken rst = (RequestSecurityToken) parentXMLObject;
+        final RequestSecurityToken rst = (RequestSecurityToken) parentXMLObject;
         rst.getUnknownXMLObjects().add(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenImpl.java
index 8b08af6..1f4f7d8 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenImpl.java
@@ -57,7 +57,7 @@ public class RequestedProofTokenImpl extends AbstractWSTrustObject implements Re
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenUnmarshaller.java
index 09a1f1c..8e12345 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedProofTokenUnmarshaller.java
@@ -31,7 +31,7 @@ public class RequestedProofTokenUnmarshaller extends AbstractWSTrustObjectUnmars
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestedProofToken rpt = (RequestedProofToken) parentXMLObject;
+        final RequestedProofToken rpt = (RequestedProofToken) parentXMLObject;
         rpt.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeImpl.java
index 9e88faf..1679459 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeImpl.java
@@ -58,7 +58,7 @@ public class RequestedReferenceTypeImpl extends AbstractWSTrustObject implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         if (securityTokenReference != null) {
             children.add(securityTokenReference);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeUnmarshaller.java
index bbedac7..f935196 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedReferenceTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class RequestedReferenceTypeUnmarshaller extends AbstractWSTrustObjectUnm
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestedReferenceType rrt = (RequestedReferenceType) parentXMLObject;
+        final RequestedReferenceType rrt = (RequestedReferenceType) parentXMLObject;
         if (childXMLObject instanceof SecurityTokenReference) {
             rrt.setSecurityTokenReference((SecurityTokenReference) childXMLObject);
         } else {
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenImpl.java
index 8caabd5..16a73d2 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenImpl.java
@@ -57,7 +57,7 @@ public class RequestedSecurityTokenImpl extends AbstractWSTrustObject implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenUnmarshaller.java
index 3737225..c2c8c16 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/RequestedSecurityTokenUnmarshaller.java
@@ -31,7 +31,7 @@ public class RequestedSecurityTokenUnmarshaller extends AbstractWSTrustObjectUnm
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestedSecurityToken reqToken = (RequestedSecurityToken) parentXMLObject;
+        final RequestedSecurityToken reqToken = (RequestedSecurityToken) parentXMLObject;
         reqToken.setUnknownXMLObject(childXMLObject);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeImpl.java
index 76e19d4..980adcd 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeImpl.java
@@ -85,7 +85,7 @@ public class SignChallengeTypeImpl extends AbstractWSTrustObject implements Sign
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         if (challenge != null) {
             children.add(challenge);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeMarshaller.java
index 5f2b881..444878d 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeMarshaller.java
@@ -32,7 +32,7 @@ public class SignChallengeTypeMarshaller extends AbstractWSTrustObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SignChallengeType signChallengeType = (SignChallengeType) xmlObject;
+        final SignChallengeType signChallengeType = (SignChallengeType) xmlObject;
         XMLObjectSupport.marshallAttributeMap(signChallengeType.getUnknownAttributes(), domElement);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeUnmarshaller.java
index ffb4d8d..a0baf92 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/SignChallengeTypeUnmarshaller.java
@@ -34,14 +34,14 @@ public class SignChallengeTypeUnmarshaller extends AbstractWSTrustObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        SignChallengeType signChallengeType= (SignChallengeType) xmlObject;
+        final SignChallengeType signChallengeType= (SignChallengeType) xmlObject;
         XMLObjectSupport.unmarshallToAttributeMap(signChallengeType.getUnknownAttributes(), attribute);
     }
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        SignChallengeType signChallengeType= (SignChallengeType) parentXMLObject;
+        final SignChallengeType signChallengeType= (SignChallengeType) parentXMLObject;
         
         if (childXMLObject instanceof Challenge) {
             signChallengeType.setChallenge((Challenge) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusImpl.java
index a362945..7bf609f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusImpl.java
@@ -71,7 +71,7 @@ public class StatusImpl extends AbstractWSTrustObject implements Status {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (code != null) {
             children.add(code);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusUnmarshaller.java
index 3e67f02..ef51ae4 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/StatusUnmarshaller.java
@@ -33,7 +33,7 @@ public class StatusUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject) 
             throws UnmarshallingException {
-        Status status= (Status) parentXMLObject;
+        final Status status= (Status) parentXMLObject;
         
         if (childXMLObject instanceof Code) {
             status.setCode((Code) childXMLObject);
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyImpl.java
index c8a8707..656e6c9 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyImpl.java
@@ -69,7 +69,7 @@ public class UseKeyImpl extends AbstractWSTrustObject implements UseKey {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyMarshaller.java
index 4082e48..7520504 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyMarshaller.java
@@ -31,7 +31,7 @@ public class UseKeyMarshaller extends AbstractWSTrustObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        UseKey useKey = (UseKey) xmlObject;
+        final UseKey useKey = (UseKey) xmlObject;
         if (useKey.getSig() != null) {
             domElement.setAttributeNS(null, UseKey.SIG_ATTRIB_NAME, useKey.getSig());
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyUnmarshaller.java
index 190de79..ac77991 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/UseKeyUnmarshaller.java
@@ -31,7 +31,7 @@ public class UseKeyUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        UseKey uk = (UseKey) xmlObject;
+        final UseKey uk = (UseKey) xmlObject;
         
         if (UseKey.SIG_ATTRIB_NAME.equals(attribute.getLocalName())) {
             uk.setSig(attribute.getValue());
@@ -43,7 +43,7 @@ public class UseKeyUnmarshaller extends AbstractWSTrustObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        UseKey uk = (UseKey) parentXMLObject;
+        final UseKey uk = (UseKey) parentXMLObject;
         uk.setUnknownXMLObject(childXMLObject);
     }
 }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetImpl.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetImpl.java
index ab0a943..e73124b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetImpl.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetImpl.java
@@ -56,7 +56,7 @@ public class ValidateTargetImpl extends AbstractWSTrustObject implements Validat
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (unknownChild != null) {
             children.add(unknownChild);
         }
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetUnmarshaller.java
index ebc60d8..79c1bc0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/ValidateTargetUnmarshaller.java
@@ -31,7 +31,7 @@ public class ValidateTargetUnmarshaller extends AbstractWSTrustObjectUnmarshalle
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ValidateTarget vt = (ValidateTarget) parentXMLObject;
+        final ValidateTarget vt = (ValidateTarget) parentXMLObject;
         vt.setUnknownXMLObject(childXMLObject);
     }
 

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


More information about the commits mailing list