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

Tom Zeller tzeller at dragonacea.biz
Thu Aug 10 18:25:55 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=35dd6b2fff0cde20da0ff3303b43cb1d4ead1357

commit 35dd6b2fff0cde20da0ff3303b43cb1d4ead1357
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 10 16:49:41 2017 -0500

    JPAR-85 - Checkstyle, check final variables
---
 .../org/opensaml/xacml/ctx/impl/ActionTypeImpl.java  |  2 +-
 .../xacml/ctx/impl/ActionTypeUnmarshaller.java       |  2 +-
 .../opensaml/xacml/ctx/impl/AttributeTypeImpl.java   |  2 +-
 .../xacml/ctx/impl/AttributeTypeMarshaller.java      |  2 +-
 .../xacml/ctx/impl/AttributeTypeUnmarshaller.java    |  4 ++--
 .../xacml/ctx/impl/AttributeValueTypeImpl.java       |  2 +-
 .../xacml/ctx/impl/AttributeValueTypeMarshaller.java |  4 ++--
 .../ctx/impl/AttributeValueTypeUnmarshaller.java     |  6 +++---
 .../xacml/ctx/impl/DecisionTypeMarshaller.java       |  2 +-
 .../xacml/ctx/impl/DecisionTypeUnmarshaller.java     |  2 +-
 .../opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java |  2 +-
 .../xacml/ctx/impl/EnvironmentTypeUnmarshaller.java  |  2 +-
 .../ctx/impl/MissingAttributeDetailTypeImpl.java     |  2 +-
 .../impl/MissingAttributeDetailTypeMarshaller.java   |  2 +-
 .../impl/MissingAttributeDetailTypeUnmarshaller.java |  4 ++--
 .../org/opensaml/xacml/ctx/impl/RequestTypeImpl.java |  2 +-
 .../xacml/ctx/impl/RequestTypeUnmarshaller.java      |  2 +-
 .../xacml/ctx/impl/ResourceContentTypeImpl.java      |  2 +-
 .../ctx/impl/ResourceContentTypeMarshaller.java      |  4 ++--
 .../ctx/impl/ResourceContentTypeUnmarshaller.java    |  6 +++---
 .../opensaml/xacml/ctx/impl/ResourceTypeImpl.java    |  2 +-
 .../xacml/ctx/impl/ResourceTypeUnmarshaller.java     |  2 +-
 .../opensaml/xacml/ctx/impl/ResponseTypeImpl.java    |  2 +-
 .../xacml/ctx/impl/ResponseTypeUnmarshaller.java     |  2 +-
 .../org/opensaml/xacml/ctx/impl/ResultTypeImpl.java  |  2 +-
 .../xacml/ctx/impl/ResultTypeMarshaller.java         |  2 +-
 .../xacml/ctx/impl/ResultTypeUnmarshaller.java       |  4 ++--
 .../opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java  |  2 +-
 .../xacml/ctx/impl/StatusCodeTypeMarshaller.java     |  2 +-
 .../xacml/ctx/impl/StatusCodeTypeUnmarshaller.java   |  4 ++--
 .../xacml/ctx/impl/StatusDetailTypeImpl.java         |  2 +-
 .../xacml/ctx/impl/StatusDetailTypeUnmarshaller.java |  2 +-
 .../xacml/ctx/impl/StatusMessageTypeMarshaller.java  |  2 +-
 .../ctx/impl/StatusMessageTypeUnmarshaller.java      |  2 +-
 .../org/opensaml/xacml/ctx/impl/StatusTypeImpl.java  |  2 +-
 .../xacml/ctx/impl/StatusTypeUnmarshaller.java       |  2 +-
 .../org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java |  2 +-
 .../xacml/ctx/impl/SubjectTypeMarshaller.java        |  2 +-
 .../xacml/ctx/impl/SubjectTypeUnmarshaller.java      |  4 ++--
 .../xacml/ctx/provider/impl/ObligationService.java   | 20 ++++++++++----------
 .../xacml/policy/impl/ActionMatchTypeImpl.java       | 10 +++++-----
 .../xacml/policy/impl/ActionMatchTypeMarshaller.java |  2 +-
 .../policy/impl/ActionMatchTypeUnmarshaller.java     |  4 ++--
 .../opensaml/xacml/policy/impl/ActionTypeImpl.java   |  2 +-
 .../xacml/policy/impl/ActionTypeUnmarshaller.java    |  2 +-
 .../opensaml/xacml/policy/impl/ActionsTypeImpl.java  |  2 +-
 .../xacml/policy/impl/ActionsTypeUnmarshaller.java   |  2 +-
 .../opensaml/xacml/policy/impl/ApplyTypeImpl.java    |  2 +-
 .../xacml/policy/impl/ApplyTypeMarshaller.java       |  2 +-
 .../xacml/policy/impl/ApplyTypeUnmarshaller.java     |  6 +++---
 .../impl/AttributeAssignmentTypeMarshaller.java      |  2 +-
 .../impl/AttributeAssignmentTypeUnmarshaller.java    |  2 +-
 .../impl/AttributeDesignatorTypeMarshaller.java      |  2 +-
 .../impl/AttributeDesignatorTypeUnmarshaller.java    |  2 +-
 .../policy/impl/AttributeSelectorTypeMarshaller.java |  2 +-
 .../impl/AttributeSelectorTypeUnmarshaller.java      |  2 +-
 .../xacml/policy/impl/AttributeValueTypeImpl.java    |  2 +-
 .../policy/impl/AttributeValueTypeMarshaller.java    |  4 ++--
 .../policy/impl/AttributeValueTypeUnmarshaller.java  |  8 ++++----
 .../xacml/policy/impl/CombinerParameterTypeImpl.java |  2 +-
 .../policy/impl/CombinerParameterTypeMarshaller.java |  2 +-
 .../impl/CombinerParameterTypeUnmarshaller.java      |  4 ++--
 .../policy/impl/CombinerParametersTypeImpl.java      |  2 +-
 .../impl/CombinerParametersTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/ConditionTypeImpl.java         |  2 +-
 .../xacml/policy/impl/ConditionTypeUnmarshaller.java |  2 +-
 .../opensaml/xacml/policy/impl/DefaultsTypeImpl.java |  2 +-
 .../xacml/policy/impl/DefaultsTypeUnmarshaller.java  |  2 +-
 .../xacml/policy/impl/DescriptionTypeMarshaller.java |  2 +-
 .../policy/impl/DescriptionTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/EnvironmentMatchTypeImpl.java  | 10 +++++-----
 .../policy/impl/EnvironmentMatchTypeMarshaller.java  |  2 +-
 .../impl/EnvironmentMatchTypeUnmarshaller.java       |  4 ++--
 .../xacml/policy/impl/EnvironmentTypeImpl.java       |  2 +-
 .../policy/impl/EnvironmentTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/EnvironmentsTypeImpl.java      |  2 +-
 .../policy/impl/EnvironmentsTypeUnmarshaller.java    |  2 +-
 .../xacml/policy/impl/FunctionTypeMarshaller.java    |  2 +-
 .../xacml/policy/impl/FunctionTypeUnmarshaller.java  |  2 +-
 .../xacml/policy/impl/IdReferenceTypeMarshaller.java |  2 +-
 .../policy/impl/IdReferenceTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/ObligationTypeImpl.java        |  2 +-
 .../xacml/policy/impl/ObligationTypeMarshaller.java  |  2 +-
 .../policy/impl/ObligationTypeUnmarshaller.java      |  4 ++--
 .../xacml/policy/impl/ObligationsTypeImpl.java       |  2 +-
 .../policy/impl/ObligationsTypeUnmarshaller.java     |  2 +-
 .../impl/PolicyCombinerParametersTypeMarshaller.java |  2 +-
 .../PolicyCombinerParametersTypeUnmarshaller.java    |  2 +-
 .../PolicySetCombinerParametersTypeMarshaller.java   |  3 ++-
 .../PolicySetCombinerParametersTypeUnmarshaller.java |  2 +-
 .../xacml/policy/impl/PolicySetTypeImpl.java         |  2 +-
 .../xacml/policy/impl/PolicySetTypeMarshaller.java   |  2 +-
 .../xacml/policy/impl/PolicySetTypeUnmarshaller.java |  4 ++--
 .../opensaml/xacml/policy/impl/PolicyTypeImpl.java   |  2 +-
 .../xacml/policy/impl/PolicyTypeMarshaller.java      |  2 +-
 .../xacml/policy/impl/PolicyTypeUnmarshaller.java    |  4 ++--
 .../xacml/policy/impl/ResourceMatchTypeImpl.java     | 10 +++++-----
 .../policy/impl/ResourceMatchTypeMarshaller.java     |  2 +-
 .../policy/impl/ResourceMatchTypeUnmarshaller.java   |  4 ++--
 .../opensaml/xacml/policy/impl/ResourceTypeImpl.java |  2 +-
 .../xacml/policy/impl/ResourceTypeUnmarshaller.java  |  2 +-
 .../xacml/policy/impl/ResourcesTypeImpl.java         |  2 +-
 .../xacml/policy/impl/ResourcesTypeUnmarshaller.java |  2 +-
 .../impl/RuleCombinerParametersTypeMarshaller.java   |  2 +-
 .../impl/RuleCombinerParametersTypeUnmarshaller.java |  4 ++--
 .../org/opensaml/xacml/policy/impl/RuleTypeImpl.java |  2 +-
 .../xacml/policy/impl/RuleTypeMarshaller.java        |  2 +-
 .../xacml/policy/impl/RuleTypeUnmarshaller.java      |  4 ++--
 .../SubjectAttributeDesignatorTypeMarshaller.java    |  3 ++-
 .../SubjectAttributeDesignatorTypeUnmarshaller.java  |  3 ++-
 .../xacml/policy/impl/SubjectMatchTypeImpl.java      | 10 +++++-----
 .../policy/impl/SubjectMatchTypeMarshaller.java      |  2 +-
 .../policy/impl/SubjectMatchTypeUnmarshaller.java    |  4 ++--
 .../opensaml/xacml/policy/impl/SubjectTypeImpl.java  |  2 +-
 .../xacml/policy/impl/SubjectTypeUnmarshaller.java   |  2 +-
 .../opensaml/xacml/policy/impl/SubjectsTypeImpl.java |  2 +-
 .../xacml/policy/impl/SubjectsTypeUnmarshaller.java  |  2 +-
 .../opensaml/xacml/policy/impl/TargetTypeImpl.java   |  2 +-
 .../xacml/policy/impl/TargetTypeUnmarshaller.java    |  2 +-
 .../policy/impl/VariableDefinitionTypeImpl.java      |  2 +-
 .../impl/VariableDefinitionTypeMarshaller.java       |  2 +-
 .../impl/VariableDefinitionTypeUnmarshaller.java     |  4 ++--
 .../xacml/policy/impl/VariableReferenceTypeImpl.java |  2 +-
 .../policy/impl/VariableReferenceTypeMarshaller.java |  2 +-
 .../impl/VariableReferenceTypeUnmarshaller.java      |  4 ++--
 125 files changed, 182 insertions(+), 179 deletions(-)

diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImpl.java
index d825ad4..a140081 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImpl.java
@@ -52,7 +52,7 @@ public class ActionTypeImpl extends AbstractXACMLObject implements ActionType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(attributes);
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeUnmarshaller.java
index ad70cfd..7025b2d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class ActionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        ActionType action = (ActionType) parentObject;
+        final ActionType action = (ActionType) parentObject;
 
         if (childObject instanceof AttributeType) {
             action.getAttributes().add((AttributeType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java
index 4af27f6..2f5a537 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java
@@ -87,7 +87,7 @@ public class AttributeTypeImpl extends AbstractXACMLObject implements AttributeT
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(attributeValues);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java
index 2e14dea..f85e66d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java
@@ -34,7 +34,7 @@ public class AttributeTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        AttributeType attribute = (AttributeType) samlElement;
+        final AttributeType attribute = (AttributeType) samlElement;
 
         if (attribute.getIssuer() != null) {
             domElement.setAttributeNS(null, AttributeType.ISSUER_ATTRIB_NAME, attribute.getIssuer());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeUnmarshaller.java
index 87cb242..f31abbe 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class AttributeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        AttributeType attribute = (AttributeType) parentObject;
+        final AttributeType attribute = (AttributeType) parentObject;
      
         if (childObject instanceof AttributeValueType) {
             attribute.getAttributeValues().add((AttributeValueType)childObject);
@@ -47,7 +47,7 @@ public class AttributeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
-        AttributeType attrib = (AttributeType) xmlObject;
+        final AttributeType attrib = (AttributeType) xmlObject;
 
         if (attribute.getLocalName().equals(AttributeType.ATTRIBUTEID_ATTTRIB_NAME)) {
             attrib.setAttributeID(attribute.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImpl.java
index af42ff4..61f947d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImpl.java
@@ -57,7 +57,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (textContent == null) {
             children.addAll(unknownElements);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeMarshaller.java
index f55411f..456de33 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeMarshaller.java
@@ -35,7 +35,7 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         marshallUnknownAttributes(attributeValue, domElement);
     }
@@ -43,7 +43,7 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if (attributeValue.getValue() != null) {
             ElementSupport.appendTextContent(domElement, attributeValue.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
index de3ced6..4a28d12 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         processUnknownAttribute(attributeValue, attribute);
     }
@@ -44,13 +44,13 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
        
-        AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
+        final AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
         attributeValue.getUnknownXMLObjects().add(childXMLObject);  
    }
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
         attributeValue.setValue(StringSupport.trimOrNull(elementContent));
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeMarshaller.java
index f6864c6..cc39f60 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeMarshaller.java
@@ -36,7 +36,7 @@ public class DecisionTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
             throws MarshallingException {
-        DecisionType decision = (DecisionType) samlObject;
+        final DecisionType decision = (DecisionType) samlObject;
         ElementSupport.appendTextContent(domElement, decision.getDecision().toString());
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeUnmarshaller.java
index db22ce9..c105c77 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class DecisionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        DecisionType decision = (DecisionType) samlObject;
+        final DecisionType decision = (DecisionType) samlObject;
         decision.setDecision(DECISION.valueOf(elementContent));
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java
index 6558cea..c559642 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java
@@ -53,7 +53,7 @@ public class EnvironmentTypeImpl extends AbstractXACMLObject implements Environm
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(attributes);
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeUnmarshaller.java
index 04cf95b..b6ba609 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class EnvironmentTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        EnvironmentType environment = (EnvironmentType) parentObject;
+        final EnvironmentType environment = (EnvironmentType) parentObject;
        
         if (childObject instanceof AttributeType) {
             environment.getAttributes().add((AttributeType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImpl.java
index 29ccdea..4dcbd01 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImpl.java
@@ -77,7 +77,7 @@ public class MissingAttributeDetailTypeImpl extends AbstractXACMLObject implemen
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(attributeValues);
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeMarshaller.java
index 0f04941..b9e6d23 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeMarshaller.java
@@ -33,7 +33,7 @@ public class MissingAttributeDetailTypeMarshaller extends AbstractXACMLObjectMar
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
+        final MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
 
         if (madt.getAttributeId() != null) {
             domElement.setAttributeNS(null, MissingAttributeDetailType.ATTRIBUTE_ID_ATTRIB_NAME, madt.getAttributeId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeUnmarshaller.java
index 41fab23..3592ceb 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class MissingAttributeDetailTypeUnmarshaller extends AbstractXACMLObjectU
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
+        final MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
 
         if (attribute.getLocalName().equals(MissingAttributeDetailType.ATTRIBUTE_ID_ATTRIB_NAME)) {
             madt.setAttributeId(attribute.getValue());
@@ -50,7 +50,7 @@ public class MissingAttributeDetailTypeUnmarshaller extends AbstractXACMLObjectU
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        MissingAttributeDetailType madt = (MissingAttributeDetailType) parentXMLObject;
+        final MissingAttributeDetailType madt = (MissingAttributeDetailType) parentXMLObject;
         if (childXMLObject instanceof AttributeValueType) {
             madt.getAttributeValues().add((AttributeValueType) childXMLObject);
         } else {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImpl.java
index 98f565d..c210d92 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImpl.java
@@ -90,7 +90,7 @@ public class RequestTypeImpl extends AbstractXACMLObject implements RequestType
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(subjects);
         children.addAll(resources);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeUnmarshaller.java
index b994b8d..720fcb9 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeUnmarshaller.java
@@ -37,7 +37,7 @@ public class RequestTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RequestType request = (RequestType) parentXMLObject;
+        final RequestType request = (RequestType) parentXMLObject;
 
         if (childXMLObject instanceof ActionType) {
             request.setAction((ActionType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImpl.java
index e88679b..ac8e632 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImpl.java
@@ -57,7 +57,7 @@ public class ResourceContentTypeImpl extends AbstractXACMLObject implements Reso
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(unknownElements);
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeMarshaller.java
index ad3056f..68a0ce3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeMarshaller.java
@@ -35,7 +35,7 @@ public class ResourceContentTypeMarshaller extends AbstractXACMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ResourceContentType resourceContent  = (ResourceContentType)xmlObject;
+        final ResourceContentType resourceContent  = (ResourceContentType)xmlObject;
         
         marshallUnknownAttributes(resourceContent, domElement);
     }
@@ -43,7 +43,7 @@ public class ResourceContentTypeMarshaller extends AbstractXACMLObjectMarshaller
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        ResourceContentType resourceContent = (ResourceContentType) xmlObject;
+        final ResourceContentType resourceContent = (ResourceContentType) xmlObject;
         
         if(resourceContent.getValue() != null){
             ElementSupport.appendTextContent(domElement, resourceContent.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
index 02b585d..0a20acf 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class ResourceContentTypeUnmarshaller extends AbstractXACMLObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        ResourceContentType resourceContent = (ResourceContentType) xmlObject;
+        final ResourceContentType resourceContent = (ResourceContentType) xmlObject;
 
         processUnknownAttribute(resourceContent, attribute);
     }
@@ -43,13 +43,13 @@ public class ResourceContentTypeUnmarshaller extends AbstractXACMLObjectUnmarsha
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ResourceContentType resourceContent = (ResourceContentType) parentXMLObject;
+        final ResourceContentType resourceContent = (ResourceContentType) parentXMLObject;
         resourceContent.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        ResourceContentType resourceContent = (ResourceContentType) xmlObject;
+        final ResourceContentType resourceContent = (ResourceContentType) xmlObject;
         resourceContent.setValue(StringSupport.trimOrNull(elementContent));
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImpl.java
index 44005b5..b44a640 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImpl.java
@@ -56,7 +56,7 @@ public class ResourceTypeImpl extends AbstractXACMLObject implements ResourceTyp
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (resourceContent != null) {
             children.add(resourceContent);
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeUnmarshaller.java
index fe229d2..7436fae 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class ResourceTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        ResourceType resource = (ResourceType) parentObject;
+        final ResourceType resource = (ResourceType) parentObject;
 
         if (childObject instanceof ResourceContentType) {
             resource.setResourceContent((ResourceContentType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImpl.java
index 72233f9..78bcba5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImpl.java
@@ -47,7 +47,7 @@ public class ResponseTypeImpl extends AbstractXACMLObject implements ResponseTyp
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(results);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeUnmarshaller.java
index df18903..c55c2f7 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class ResponseTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ResponseType response = (ResponseType) parentXMLObject;
+        final ResponseType response = (ResponseType) parentXMLObject;
         if (childXMLObject instanceof ResultType) {
             response.getResults().add((ResultType) childXMLObject);
         } else {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImpl.java
index 782afb1..47b74c4 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImpl.java
@@ -96,7 +96,7 @@ public class ResultTypeImpl extends AbstractXACMLObject implements ResultType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (decision != null) {
             children.add(decision);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeMarshaller.java
index 9be0a05..316e867 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeMarshaller.java
@@ -34,7 +34,7 @@ public class ResultTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        ResultType result = (ResultType) samlElement;
+        final ResultType result = (ResultType) samlElement;
 
         if (result.getResourceId() != null) {
             domElement.setAttributeNS(null, ResultType.RESOURCE_ID_ATTTRIB_NAME, result.getResourceId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeUnmarshaller.java
index 07a1bf3..97bcc7e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class ResultTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        ResultType result = (ResultType) xmlObject;
+        final ResultType result = (ResultType) xmlObject;
         if (attribute.getLocalName().equals(ResultType.RESOURCE_ID_ATTTRIB_NAME)) {
             result.setResourceId(attribute.getValue());
         } else {
@@ -47,7 +47,7 @@ public class ResultTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        ResultType result = (ResultType) parentObject;
+        final ResultType result = (ResultType) parentObject;
 
         if (childObject instanceof ObligationsType) {
             result.setObligations((ObligationsType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java
index cb7da7f..71d9186 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java
@@ -48,7 +48,7 @@ public class StatusCodeTypeImpl extends AbstractXACMLObject implements StatusCod
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (statusCode != null) {
             children.add(statusCode);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeMarshaller.java
index 03b5138..961ca00 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeMarshaller.java
@@ -34,7 +34,7 @@ public class StatusCodeTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        StatusCodeType attribute = (StatusCodeType) samlElement;
+        final StatusCodeType attribute = (StatusCodeType) samlElement;
         if (attribute.getValue() != null) {
             domElement.setAttributeNS(null, StatusCodeType.VALUE_ATTTRIB_NAME, attribute.getValue());
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeUnmarshaller.java
index ac3ae5f..03b7786 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class StatusCodeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        StatusCodeType statusCode = (StatusCodeType) xmlObject;
+        final StatusCodeType statusCode = (StatusCodeType) xmlObject;
         if (attribute.getLocalName().equals(StatusCodeType.VALUE_ATTTRIB_NAME)) {
             statusCode.setValue(attribute.getValue());
         } else {
@@ -44,7 +44,7 @@ public class StatusCodeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        StatusCodeType statuscode = (StatusCodeType) parentObject;
+        final StatusCodeType statuscode = (StatusCodeType) parentObject;
         if (childObject instanceof StatusCodeType) {
             statuscode.setStatusCode((StatusCodeType) childObject);
         } else {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImpl.java
index 7450027..6fa6846 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImpl.java
@@ -49,7 +49,7 @@ public class StatusDetailTypeImpl extends AbstractXACMLObject implements StatusD
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(unknownChildren);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeUnmarshaller.java
index f911f03..2537d17 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class StatusDetailTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
      */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        StatusDetailType statusDetail = (StatusDetailType) parentSAMLObject;
+        final StatusDetailType statusDetail = (StatusDetailType) parentSAMLObject;
         statusDetail.getUnknownXMLObjects().add(childSAMLObject);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeMarshaller.java
index d984ef6..e3324d8 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeMarshaller.java
@@ -33,7 +33,7 @@ public class StatusMessageTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        StatusMessageType message = (StatusMessageType)xmlObject;
+        final StatusMessageType message = (StatusMessageType)xmlObject;
 
         if(message.getValue() != null){
             ElementSupport.appendTextContent(domElement, message.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeUnmarshaller.java
index cec3159..12a4a13 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeUnmarshaller.java
@@ -28,7 +28,7 @@ public class StatusMessageTypeUnmarshaller extends AbstractXACMLObjectUnmarshall
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String content) {
-        StatusMessageType message = (StatusMessageType)xmlObject;
+        final StatusMessageType message = (StatusMessageType)xmlObject;
         message.setValue(content);
     }
 }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImpl.java
index 6b029ea..aba11c1 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImpl.java
@@ -63,7 +63,7 @@ public class StatusTypeImpl extends AbstractXACMLObject implements StatusType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (statusCode != null) {
             children.add(statusCode);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeUnmarshaller.java
index 00fe52c..c19398f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class StatusTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        StatusType status = (StatusType) parentObject;
+        final StatusType status = (StatusType) parentObject;
 
         if (childObject instanceof StatusCodeType) {
             status.setStatusCode((StatusCodeType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java
index 34fab17..12c47ad 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java
@@ -61,7 +61,7 @@ public class SubjectTypeImpl extends AbstractXACMLObject implements SubjectType
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(attributes);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeMarshaller.java
index 83131fe..b95bdee 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeMarshaller.java
@@ -34,7 +34,7 @@ public class SubjectTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        SubjectType attribute = (SubjectType) samlElement;
+        final SubjectType attribute = (SubjectType) samlElement;
         if (attribute.getSubjectCategory() != null) {
             domElement.setAttributeNS(null, SubjectType.SUBJECT_CATEGORY_ATTTRIB_NAME, attribute.getSubjectCategory());
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeUnmarshaller.java
index 076e29c..fcc4eac 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        SubjectType attrib = (SubjectType) xmlObject;
+        final SubjectType attrib = (SubjectType) xmlObject;
         if (attribute.getLocalName().equals(SubjectType.SUBJECT_CATEGORY_ATTTRIB_NAME)) {
             attrib.setSubjectCategory(attribute.getValue());
         } else {
@@ -45,7 +45,7 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        SubjectType subject = (SubjectType) parentObject;
+        final SubjectType subject = (SubjectType) parentObject;
         if (childObject instanceof AttributeType) {
             subject.getAttributes().add((AttributeType) childObject);
         } else {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationService.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationService.java
index 626feec..883eec7 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationService.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationService.java
@@ -69,7 +69,7 @@ public class ObligationService {
             return;
         }
 
-        Lock writeLock = rwLock.writeLock();
+        final Lock writeLock = rwLock.writeLock();
         writeLock.lock();
         try {
             obligationHandlers.add(handler);
@@ -90,7 +90,7 @@ public class ObligationService {
             return;
         }
 
-        Lock writeLock = rwLock.writeLock();
+        final Lock writeLock = rwLock.writeLock();
         writeLock.lock();
         try {
             obligationHandlers.addAll(handlers);
@@ -111,7 +111,7 @@ public class ObligationService {
             return;
         }
 
-        Lock writeLock = rwLock.writeLock();
+        final Lock writeLock = rwLock.writeLock();
         writeLock.lock();
         try {
             obligationHandlers.remove(handler);
@@ -130,11 +130,11 @@ public class ObligationService {
      * @throws ObligationProcessingException thrown if there is a problem evaluating an obligation
      */
     public void processObligations(final ObligationProcessingContext context) throws ObligationProcessingException {
-        Lock readLock = rwLock.readLock();
+        final Lock readLock = rwLock.readLock();
         readLock.lock();
         try {
-            Iterator<BaseObligationHandler> handlerItr = obligationHandlers.iterator();
-            Map<String, ObligationType> effectiveObligations = preprocessObligations(context);
+            final Iterator<BaseObligationHandler> handlerItr = obligationHandlers.iterator();
+            final Map<String, ObligationType> effectiveObligations = preprocessObligations(context);
 
             BaseObligationHandler handler;
             while (handlerItr.hasNext()) {
@@ -158,21 +158,21 @@ public class ObligationService {
      * @return preprocessed obligations
      */
     protected Map<String, ObligationType> preprocessObligations(final ObligationProcessingContext context) {
-        HashMap<String, ObligationType> effectiveObligations = new HashMap<>();
+        final HashMap<String, ObligationType> effectiveObligations = new HashMap<>();
 
-        ObligationsType obligations = context.getAuthorizationDecisionResult().getObligations();
+        final ObligationsType obligations = context.getAuthorizationDecisionResult().getObligations();
         if (obligations == null || obligations.getObligations() == null) {
             return effectiveObligations;
         }
 
-        EffectType activeEffect;
+        final EffectType activeEffect;
         if (context.getAuthorizationDecisionResult().getDecision().getDecision() == DECISION.Permit) {
             activeEffect = EffectType.Permit;
         } else {
             activeEffect = EffectType.Deny;
         }
 
-        for (ObligationType obligation : obligations.getObligations()) {
+        for (final ObligationType obligation : obligations.getObligations()) {
             if (obligation != null && obligation.getFulfillOn() == activeEffect) {
                 effectiveObligations.put(obligation.getObligationId(), obligation);
             }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImpl.java
index fe046fc..967e53c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImpl.java
@@ -55,7 +55,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
 
     /** {@inheritDoc} */
     public AttributeSelectorType getAttributeSelector() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeSelectorType.DEFAULT_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeSelectorType) selectors.get(0);
@@ -71,7 +71,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
 
     /** {@inheritDoc} */
     public AttributeDesignatorType getActionAttributeDesignator() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeDesignatorType.ACTION_ATTRIBUTE_DESIGNATOR_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeDesignatorType) selectors.get(0);
@@ -87,7 +87,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
 
     /** {@inheritDoc} */
     public void setAttributeSelector(final AttributeSelectorType selector) {
-        AttributeSelectorType currentSelector = getAttributeSelector();
+        final AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
         }
@@ -102,7 +102,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
 
     /** {@inheritDoc} */
     public void setActionAttributeDesignator(final AttributeDesignatorType attribute) {
-        AttributeDesignatorType currentDesignator = getActionAttributeDesignator();
+        final AttributeDesignatorType currentDesignator = getActionAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
         }
@@ -117,7 +117,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.add(attributeValue);
         if (!attributeChoice.isEmpty()) {
             children.addAll(attributeChoice);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeMarshaller.java
index 3768768..5c3c6c7 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeMarshaller.java
@@ -31,7 +31,7 @@ public class ActionMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ActionMatchType matchType = (ActionMatchType) xmlObject;
+        final ActionMatchType matchType = (ActionMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(matchType.getMatchId())) {
             domElement.setAttributeNS(null, ActionMatchType.MATCH_ID_ATTRIB_NAME, matchType.getMatchId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
index a834c56..91673e9 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class ActionMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(ActionMatchType.MATCH_ID_ATTRIB_NAME)) {
-            ActionMatchType matchType = (ActionMatchType) xmlObject;
+            final ActionMatchType matchType = (ActionMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -46,7 +46,7 @@ public class ActionMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ActionMatchType matchType = (ActionMatchType) parentXMLObject;
+        final ActionMatchType matchType = (ActionMatchType) parentXMLObject;
       
         if (childXMLObject instanceof AttributeValueType) {
             matchType.setAttributeValue((AttributeValueType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImpl.java
index ef14ad1..0f47244 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImpl.java
@@ -53,7 +53,7 @@ public class ActionTypeImpl extends AbstractXACMLObject implements ActionType {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(actionMatch);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeUnmarshaller.java
index 4bab823..4a27895 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class ActionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ActionType actionType = (ActionType) parentXMLObject;
+        final ActionType actionType = (ActionType) parentXMLObject;
         
         if(childXMLObject instanceof ActionMatchType){
             actionType.getActionMatches().add((ActionMatchType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImpl.java
index e17c7f6..42cb114 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImpl.java
@@ -53,7 +53,7 @@ public class ActionsTypeImpl extends AbstractXACMLObject implements ActionsType
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(action);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeUnmarshaller.java
index 417b194..eda0736 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class ActionsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ActionsType actionType = (ActionsType) parentXMLObject;
+        final ActionsType actionType = (ActionsType) parentXMLObject;
         
         if(childXMLObject instanceof ActionType){
             actionType.getActions().add((ActionType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImpl.java
index 265a539..bc983e0 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImpl.java
@@ -67,7 +67,7 @@ public class ApplyTypeImpl extends AbstractXACMLObject implements ApplyType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren(){   
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
             
         if(!expressions.isEmpty()){
             children.addAll(expressions);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeMarshaller.java
index 67466cc..18bbf44 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeMarshaller.java
@@ -33,7 +33,7 @@ public class ApplyTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ApplyType applyType = (ApplyType)xmlObject;
+        final ApplyType applyType = (ApplyType)xmlObject;
         
         if(!Strings.isNullOrEmpty(applyType.getFunctionId())){
             domElement.setAttributeNS(null, ApplyType.FUNCTION_ID_ATTRIB_NAME, applyType.getFunctionId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
index a3f12a7..ff1bf2e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class ApplyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
         if (attribute.getLocalName().equals(ApplyType.FUNCTION_ID_ATTRIB_NAME)) {
-            ApplyType applyType = (ApplyType) xmlObject;
+            final ApplyType applyType = (ApplyType) xmlObject;
             applyType.setFunctionId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -48,9 +48,9 @@ public class ApplyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ApplyType applayType = (ApplyType) parentXMLObject;
+        final ApplyType applayType = (ApplyType) parentXMLObject;
         if (childXMLObject instanceof ExpressionType) {
-            ExpressionType expression = (ExpressionType) childXMLObject;
+            final ExpressionType expression = (ExpressionType) childXMLObject;
             applayType.getExpressions().add(expression);
         } else {
             super.processChildElement(parentXMLObject, childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeMarshaller.java
index b70e037..3bc1671 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeMarshaller.java
@@ -31,7 +31,7 @@ public class AttributeAssignmentTypeMarshaller extends AttributeValueTypeMarshal
     @Override
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        AttributeAssignmentType attributeAssignment = (AttributeAssignmentType) samlElement;
+        final AttributeAssignmentType attributeAssignment = (AttributeAssignmentType) samlElement;
 
         if (!Strings.isNullOrEmpty(attributeAssignment.getAttributeId())) {
             domElement.setAttributeNS(null, AttributeAssignmentType.ATTR_ID_ATTRIB_NAME, attributeAssignment
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
index b511f0d..3f3f63f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
@@ -31,7 +31,7 @@ public class AttributeAssignmentTypeUnmarshaller extends AttributeValueTypeUnmar
     @Override
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
-        AttributeAssignmentType attrib = (AttributeAssignmentType) samlObject;
+        final AttributeAssignmentType attrib = (AttributeAssignmentType) samlObject;
 
         if (attribute.getLocalName().equals(AttributeAssignmentType.ATTR_ID_ATTRIB_NAME)) {
             attrib.setAttributeId(StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeMarshaller.java
index 74c35c6..9e89e86 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeMarshaller.java
@@ -33,7 +33,7 @@ public class AttributeDesignatorTypeMarshaller extends AbstractXACMLObjectMarsha
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
+        final AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
 
         if (!Strings.isNullOrEmpty(attributeDesignatorType.getAttributeId())) {
             domElement.setAttributeNS(null, AttributeDesignatorType.ATTRIBUTE_ID_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
index ece000a..53d0ef6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class AttributeDesignatorTypeUnmarshaller extends AbstractXACMLObjectUnma
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
-        AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
+        final AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
         
         if (attribute.getLocalName().equals(AttributeDesignatorType.ATTRIBUTE_ID_ATTRIB_NAME)){
             attributeDesignatorType.setAttributeId(StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeMarshaller.java
index 993f12f..c77cea4 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeMarshaller.java
@@ -34,7 +34,7 @@ public class AttributeSelectorTypeMarshaller extends AbstractXACMLObjectMarshall
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
+        final AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
         
         if(!Strings.isNullOrEmpty(attributeSelectorType.getDataType())){
             domElement.setAttributeNS(null, AttributeSelectorType.DATA_TYPE_ATTRIB_NAME, 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
index 42e9d3b..a15b085 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class AttributeSelectorTypeUnmarshaller extends AbstractXACMLObjectUnmars
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
+        final AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
         
         if (attribute.getLocalName().equals(AttributeSelectorType.REQUEST_CONTEXT_PATH_ATTRIB_NAME)){
             attributeSelectorType.setRequestContextPath(StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImpl.java
index 73fa16f..9399a2d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImpl.java
@@ -70,7 +70,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(unknownElements);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeMarshaller.java
index 62a9d1a..9d5898b 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeMarshaller.java
@@ -34,7 +34,7 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if(!Strings.isNullOrEmpty(attributeValue.getDataType())){
             domElement.setAttributeNS(null,AttributeAssignmentType.DATA_TYPE_ATTRIB_NAME, attributeValue.getDataType());
@@ -47,7 +47,7 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
     @Override
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
             throws MarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if (attributeValue.getValue() != null) {
             ElementSupport.appendTextContent(domElement, attributeValue.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
index 6f73812..e0cd299 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
@@ -34,9 +34,9 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
-        QName attribQName = QNameSupport.getNodeQName(attribute);
+        final QName attribQName = QNameSupport.getNodeQName(attribute);
         if (attribute.isId()) {
             attributeValue.getUnknownAttributes().registerID(attribQName);
         }
@@ -53,14 +53,14 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
+        final AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
         attributeValue.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     @Override
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AttributeValueType attributeValue = (AttributeValueType) xmlObject;
+        final AttributeValueType attributeValue = (AttributeValueType) xmlObject;
         attributeValue.setValue(elementContent);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImpl.java
index 1db989d..335deac 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImpl.java
@@ -70,7 +70,7 @@ public class CombinerParameterTypeImpl extends AbstractXACMLObject implements Co
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         if(value != null){
             children.add(value);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeMarshaller.java
index 3f55ba7..24fbc5a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeMarshaller.java
@@ -33,7 +33,7 @@ public class CombinerParameterTypeMarshaller extends AbstractXACMLObjectMarshall
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
+        final CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
 
         if (!Strings.isNullOrEmpty(combinerParameterType.getParameterName())) {
             domElement.setAttributeNS(null, CombinerParameterType.PARAMETER_NAMEATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
index 1252cef..4622ff5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class CombinerParameterTypeUnmarshaller extends AbstractXACMLObjectUnmars
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
+        final CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
       
         if(attribute.getLocalName().equals(CombinerParameterType.PARAMETER_NAMEATTRIB_NAME)){
             combinerParameterType.setParameterName(StringSupport.trimOrNull(attribute.getValue()));
@@ -47,7 +47,7 @@ public class CombinerParameterTypeUnmarshaller extends AbstractXACMLObjectUnmars
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        CombinerParameterType combinerParameterType = (CombinerParameterType) parentXMLObject;
+        final CombinerParameterType combinerParameterType = (CombinerParameterType) parentXMLObject;
         
         if(childXMLObject instanceof AttributeValueType){
             combinerParameterType.setAttributeValue((AttributeValueType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImpl.java
index 38838c5..e47feeb 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImpl.java
@@ -54,7 +54,7 @@ public class CombinerParametersTypeImpl extends AbstractXACMLObject implements C
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(combinerParameters);
                        
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java
index 5e28d0d..11f2579 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class CombinerParametersTypeUnmarshaller extends AbstractXACMLObjectUnmar
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        CombinerParametersType combinerParametersType = (CombinerParametersType) parentXMLObject;
+        final CombinerParametersType combinerParametersType = (CombinerParametersType) parentXMLObject;
         
         if(childXMLObject instanceof CombinerParameterType){
             combinerParametersType.getCombinerParameters().add((CombinerParameterType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImpl.java
index c31ce43..d2bc40a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImpl.java
@@ -56,7 +56,7 @@ public class ConditionTypeImpl extends AbstractXACMLObject implements ConditionT
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
                
         if(expression != null){
             children.add(expression);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeUnmarshaller.java
index ce33569..e423e73 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class ConditionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         if(childXMLObject instanceof ExpressionType){
-            ConditionType conditionType = (ConditionType)parentXMLObject;
+            final ConditionType conditionType = (ConditionType)parentXMLObject;
             conditionType.setExpression((ExpressionType)childXMLObject);
         } else {
             super.processChildElement(parentXMLObject, childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImpl.java
index c4306e9..5d2009e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImpl.java
@@ -56,7 +56,7 @@ public class DefaultsTypeImpl extends AbstractXACMLObject implements DefaultsTyp
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (xPathVersion != null) {
             children.add(xPathVersion);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeUnmarshaller.java
index 3d3965f..8db57ef 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeUnmarshaller.java
@@ -31,7 +31,7 @@ public class DefaultsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         if (childXMLObject instanceof XSString) {
-            DefaultsType defaultType = (DefaultsType) parentXMLObject;
+            final DefaultsType defaultType = (DefaultsType) parentXMLObject;
             defaultType.setXPathVersion((XSString) childXMLObject);
         } else {
             super.processChildElement(parentXMLObject, childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeMarshaller.java
index eda92b8..1d0f732 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeMarshaller.java
@@ -34,7 +34,7 @@ public class DescriptionTypeMarshaller extends AbstractXACMLObjectMarshaller {
     @Override
     protected void marshallElementContent(final XMLObject xmlobject, final Element domElement)
             throws MarshallingException {
-        DescriptionType message = (DescriptionType) xmlobject;
+        final DescriptionType message = (DescriptionType) xmlobject;
 
         if (message.getValue() != null) {
             ElementSupport.appendTextContent(domElement, message.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeUnmarshaller.java
index dd81e5a..90274ea 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeUnmarshaller.java
@@ -29,7 +29,7 @@ public class DescriptionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     /** {@inheritDoc} */
     @Override
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        DescriptionType description = (DescriptionType) xmlObject;
+        final DescriptionType description = (DescriptionType) xmlObject;
         description.setValue(elementContent);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImpl.java
index 4bbbbb9..159617f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImpl.java
@@ -56,7 +56,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
 
     /** {@inheritDoc} */
     public AttributeSelectorType getAttributeSelector() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeSelectorType.DEFAULT_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeSelectorType) selectors.get(0);
@@ -72,7 +72,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
 
     /** {@inheritDoc} */
     public AttributeDesignatorType getEnvironmentAttributeDesignator() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeDesignatorType.ENVIRONMENT_ATTRIBUTE_DESIGNATOR_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeDesignatorType) selectors.get(0);
@@ -88,7 +88,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
 
     /** {@inheritDoc} */
     public void setAttributeSelector(final AttributeSelectorType selector) {
-        AttributeSelectorType currentSelector = getAttributeSelector();
+        final AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
         }
@@ -103,7 +103,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
 
     /** {@inheritDoc} */
     public void setEnvironmentAttributeDesignator(final AttributeDesignatorType attribute) {
-        AttributeDesignatorType currentDesignator = getEnvironmentAttributeDesignator();
+        final AttributeDesignatorType currentDesignator = getEnvironmentAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
         }
@@ -118,7 +118,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.add(attributeValue);
         if (!attributeChoice.isEmpty()) {
             children.addAll(attributeChoice);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeMarshaller.java
index 8125956..5165931 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeMarshaller.java
@@ -31,7 +31,7 @@ public class EnvironmentMatchTypeMarshaller extends AbstractXACMLObjectMarshalle
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
+        final EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(matchType.getMatchId())) {
             domElement.setAttributeNS(null, EnvironmentMatchType.MATCH_ID_ATTRIB_NAME, matchType.getMatchId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
index bd02000..4834240 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class EnvironmentMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarsh
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(EnvironmentMatchType.MATCH_ID_ATTRIB_NAME)) {
-            EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
+            final EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -46,7 +46,7 @@ public class EnvironmentMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarsh
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        EnvironmentMatchType matchType = (EnvironmentMatchType) parentXMLObject;
+        final EnvironmentMatchType matchType = (EnvironmentMatchType) parentXMLObject;
         if (childXMLObject instanceof AttributeValueType) {
             matchType.setAttributeValue((AttributeValueType) childXMLObject);
         } else if (childXMLObject instanceof AttributeDesignatorType) {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImpl.java
index 6ee7315..9903fa3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImpl.java
@@ -56,7 +56,7 @@ public class EnvironmentTypeImpl extends AbstractXACMLObject implements Environm
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(environmentMatches);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeUnmarshaller.java
index 0d0b42c..bf27075 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class EnvironmentTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        EnvironmentType environmentType = (EnvironmentType) parentXMLObject;
+        final EnvironmentType environmentType = (EnvironmentType) parentXMLObject;
         
         if(childXMLObject instanceof EnvironmentMatchType){
             environmentType.getEnvrionmentMatches().add((EnvironmentMatchType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImpl.java
index 6765064..1551941 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImpl.java
@@ -55,7 +55,7 @@ public class EnvironmentsTypeImpl extends AbstractXACMLObject implements Environ
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(environments);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeUnmarshaller.java
index 85e6941..538972f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class EnvironmentsTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        EnvironmentsType environmentsType = (EnvironmentsType) parentXMLObject;
+        final EnvironmentsType environmentsType = (EnvironmentsType) parentXMLObject;
         
         if(childXMLObject instanceof EnvironmentType){
             environmentsType.getEnvironments().add((EnvironmentType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeMarshaller.java
index 2e27dc2..447c45c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeMarshaller.java
@@ -33,7 +33,7 @@ public class FunctionTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        FunctionType functionType = (FunctionType) xmlObject;
+        final FunctionType functionType = (FunctionType) xmlObject;
         if(!Strings.isNullOrEmpty(functionType.getFunctionId())){
             domElement.setAttributeNS(null, FunctionType.FUNCTION_ID_ATTRIB_NAME,functionType.getFunctionId());
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
index 73a6b67..2ee9e38 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class FunctionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(FunctionType.FUNCTION_ID_ATTRIB_NAME)){
-            FunctionType functionType = (FunctionType) xmlObject;
+            final FunctionType functionType = (FunctionType) xmlObject;
             functionType.setFunctionId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java
index 3aecb02..fe064ee 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java
@@ -33,7 +33,7 @@ public class IdReferenceTypeMarshaller extends XSStringMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
+        final IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
         
         if(!Strings.isNullOrEmpty(idReferenceType.getEarliestVersion())){
             domElement.setAttributeNS(null, IdReferenceType.EARLIEST_VERSION_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
index bddd9bd..b973847 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class IdReferenceTypeUnmarshaller extends XSStringUnmarshaller {
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
+        final IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
      
         if(attribute.getLocalName().equals(IdReferenceType.EARLIEST_VERSION_ATTRIB_NAME)){           
             idReferenceType.setEarliestVersion(StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImpl.java
index 001d8b9..9e784fc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImpl.java
@@ -80,7 +80,7 @@ public class ObligationTypeImpl extends AbstractXACMLObject implements Obligatio
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (!attributeAssignments.isEmpty()) {
             children.addAll(attributeAssignments);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeMarshaller.java
index f1d590d..1651e7a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeMarshaller.java
@@ -33,7 +33,7 @@ public class ObligationTypeMarshaller extends AbstractXACMLObjectMarshaller {
     @Override
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
             throws MarshallingException {
-        ObligationType obligation = (ObligationType) samlElement;
+        final ObligationType obligation = (ObligationType) samlElement;
 
         if (!Strings.isNullOrEmpty(obligation.getObligationId())) {
             domElement.setAttributeNS(null, ObligationType.OBLIGATION_ID_ATTRIB_NAME, obligation.getObligationId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeUnmarshaller.java
index 3276800..99d88eb 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class ObligationTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     @Override
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
-        ObligationType obligation = (ObligationType) parentObject;
+        final ObligationType obligation = (ObligationType) parentObject;
 
         if (childObject instanceof AttributeAssignmentType) {
             obligation.getAttributeAssignments().add((AttributeAssignmentType) childObject);
@@ -45,7 +45,7 @@ public class ObligationTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
-        ObligationType obligation = (ObligationType) xmlObject;
+        final ObligationType obligation = (ObligationType) xmlObject;
 
         if (attribute.getLocalName().equals(ObligationType.OBLIGATION_ID_ATTRIB_NAME)) {
             obligation.setObligationId(attribute.getValue());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImpl.java
index 1c5487b..b9af271 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImpl.java
@@ -53,7 +53,7 @@ public class ObligationsTypeImpl extends AbstractXACMLObject implements Obligati
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(obligations);
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeUnmarshaller.java
index 98d1a8d..07680b9 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeUnmarshaller.java
@@ -31,7 +31,7 @@ public class ObligationsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
             throws UnmarshallingException {
 
-        ObligationsType obligations = (ObligationsType) parentObject;
+        final ObligationsType obligations = (ObligationsType) parentObject;
 
         if (childObject instanceof ObligationType) {
             obligations.getObligations().add((ObligationType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeMarshaller.java
index d0e666a..71d6be1 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeMarshaller.java
@@ -32,7 +32,7 @@ public class PolicyCombinerParametersTypeMarshaller extends CombinerParametersTy
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicyCombinerParametersType policyCombinerParametersType = (PolicyCombinerParametersType)xmlObject;
+        final PolicyCombinerParametersType policyCombinerParametersType = (PolicyCombinerParametersType)xmlObject;
         
         if(!Strings.isNullOrEmpty(policyCombinerParametersType.getPolicyIdRef())){
             domElement.setAttributeNS(null, PolicyCombinerParametersType.POLICY_ID_REF_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
index 30de2f8..93df111 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public class PolicyCombinerParametersTypeUnmarshaller extends CombinerParameters
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
       
         if(attribute.getLocalName().equals(PolicyCombinerParametersType.POLICY_ID_REF_ATTRIB_NAME)){
-            PolicyCombinerParametersType policyCombinerParametersType = (PolicyCombinerParametersType)xmlObject;
+            final PolicyCombinerParametersType policyCombinerParametersType = (PolicyCombinerParametersType)xmlObject;
             policyCombinerParametersType.setPolicyIdRef(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeMarshaller.java
index 0244f8f..740bab6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeMarshaller.java
@@ -32,7 +32,8 @@ public class PolicySetCombinerParametersTypeMarshaller extends CombinerParameter
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicySetCombinerParametersType policySetCombinerParametersType = (PolicySetCombinerParametersType)xmlObject;
+        final PolicySetCombinerParametersType policySetCombinerParametersType =
+                (PolicySetCombinerParametersType) xmlObject;
         
         if(!Strings.isNullOrEmpty(policySetCombinerParametersType.getPolicySetIdRef())){
             domElement.setAttributeNS(null, PolicySetCombinerParametersType.POLICY_SET_ID_REF_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
index 5cb804a..2317149 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class PolicySetCombinerParametersTypeUnmarshaller extends CombinerParamet
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if(attribute.getLocalName().equals(PolicySetCombinerParametersType.POLICY_SET_ID_REF_ATTRIB_NAME)){
-            PolicySetCombinerParametersType policySetCombinerParametersType = 
+            final PolicySetCombinerParametersType policySetCombinerParametersType = 
                 (PolicySetCombinerParametersType)xmlObject;
             policySetCombinerParametersType.setPolicySetIdRef(
                     StringSupport.trimOrNull(attribute.getValue()));
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImpl.java
index 7b9e3e8..24d493c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImpl.java
@@ -93,7 +93,7 @@ public class PolicySetTypeImpl extends AbstractXACMLObject implements PolicySetT
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (description != null) {
             children.add(description);
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeMarshaller.java
index 41b13de..829b391 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeMarshaller.java
@@ -31,7 +31,7 @@ public class PolicySetTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicySetType policySet = (PolicySetType) xmlObject;
+        final PolicySetType policySet = (PolicySetType) xmlObject;
 
         if (!Strings.isNullOrEmpty(policySet.getPolicySetId())) {
             domElement.setAttributeNS(null, PolicySetType.POLICY_SET_ID_ATTRIB_NAME, policySet.getPolicySetId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeUnmarshaller.java
index 364a56f..ecb201c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeUnmarshaller.java
@@ -38,7 +38,7 @@ public class PolicySetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        PolicySetType policySet = (PolicySetType) xmlObject;
+        final PolicySetType policySet = (PolicySetType) xmlObject;
 
         if (attribute.getLocalName().equals(PolicySetType.POLICY_SET_ID_ATTRIB_NAME)) {
             policySet.setPolicySetId(attribute.getValue());
@@ -56,7 +56,7 @@ public class PolicySetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        PolicySetType policySet = (PolicySetType) parentXMLObject;
+        final PolicySetType policySet = (PolicySetType) parentXMLObject;
 
         if (childXMLObject instanceof DescriptionType) {
             policySet.setDescription((DescriptionType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImpl.java
index b17fc87..e8d5001 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImpl.java
@@ -166,7 +166,7 @@ public class PolicyTypeImpl extends AbstractXACMLObject implements PolicyType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (description != null) {
             children.add(description);
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeMarshaller.java
index f7ae83f..c283a76 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeMarshaller.java
@@ -31,7 +31,7 @@ public class PolicyTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        PolicyType policy = (PolicyType) xmlObject;
+        final PolicyType policy = (PolicyType) xmlObject;
 
         if (!Strings.isNullOrEmpty(policy.getPolicyId())) {
             domElement.setAttributeNS(null, PolicyType.POLICY_ID_ATTRIB_NAME, policy.getPolicyId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeUnmarshaller.java
index 5df2235..8fd5000 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeUnmarshaller.java
@@ -37,7 +37,7 @@ public class PolicyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        PolicyType policy = (PolicyType) xmlObject;
+        final PolicyType policy = (PolicyType) xmlObject;
 
         if (attribute.getLocalName().equals(PolicyType.POLICY_ID_ATTRIB_NAME)) {
             policy.setPolicyId(attribute.getValue());
@@ -54,7 +54,7 @@ public class PolicyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        PolicyType policy = (PolicyType) parentXMLObject;
+        final PolicyType policy = (PolicyType) parentXMLObject;
 
         if (childXMLObject instanceof DescriptionType) {
             policy.setDescription((DescriptionType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImpl.java
index 726e444..3fc616a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImpl.java
@@ -56,7 +56,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
 
     /** {@inheritDoc} */
     public AttributeSelectorType getAttributeSelector() {
-        List<XACMLObject> selectors =
+        final List<XACMLObject> selectors =
                 (List<XACMLObject>) attributeChoice.subList(AttributeSelectorType.DEFAULT_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeSelectorType) selectors.get(0);
@@ -72,7 +72,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
 
     /** {@inheritDoc} */
     public AttributeDesignatorType getResourceAttributeDesignator() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeDesignatorType.RESOURCE_ATTRIBUTE_DESIGNATOR_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeDesignatorType) selectors.get(0);
@@ -88,7 +88,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
 
     /** {@inheritDoc} */
     public void setAttributeSelector(final AttributeSelectorType selector) {
-        AttributeSelectorType currentSelector = getAttributeSelector();
+        final AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
         }
@@ -103,7 +103,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
 
     /** {@inheritDoc} */
     public void setResourceAttributeDesignator(final AttributeDesignatorType attribute) {
-        AttributeDesignatorType currentDesignator = getResourceAttributeDesignator();
+        final AttributeDesignatorType currentDesignator = getResourceAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
         }
@@ -118,7 +118,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.add(attributeValue);
         if (!attributeChoice.isEmpty()) {
             children.addAll(attributeChoice);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeMarshaller.java
index ed9e2c4..9d7824c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeMarshaller.java
@@ -31,7 +31,7 @@ public class ResourceMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ResourceMatchType matchType = (ResourceMatchType) xmlObject;
+        final ResourceMatchType matchType = (ResourceMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(matchType.getMatchId())) {
             domElement.setAttributeNS(null, ResourceMatchType.MATCH_ID_ATTRIB_NAME, matchType.getMatchId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
index 750d899..27697a5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class ResourceMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshall
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(ResourceMatchType.MATCH_ID_ATTRIB_NAME)) {
-            ResourceMatchType matchType = (ResourceMatchType) xmlObject;
+            final ResourceMatchType matchType = (ResourceMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -46,7 +46,7 @@ public class ResourceMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshall
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ResourceMatchType matchType = (ResourceMatchType) parentXMLObject;
+        final ResourceMatchType matchType = (ResourceMatchType) parentXMLObject;
         
         if (childXMLObject instanceof AttributeValueType) {
             matchType.setAttributeValue((AttributeValueType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImpl.java
index 10f2640..b9a5982 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImpl.java
@@ -55,7 +55,7 @@ public class ResourceTypeImpl extends AbstractXACMLObject implements ResourceTyp
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(resourceMatch);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeUnmarshaller.java
index 833aff3..ff3bec6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class ResourceTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ResourceType resourceType = (ResourceType) parentXMLObject;
+        final ResourceType resourceType = (ResourceType) parentXMLObject;
         
         if(childXMLObject instanceof ResourceMatchType){
             resourceType.getResourceMatches().add((ResourceMatchType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImpl.java
index 8b6b5be..475761a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImpl.java
@@ -55,7 +55,7 @@ public class ResourcesTypeImpl extends AbstractXACMLObject implements ResourcesT
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(resource);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeUnmarshaller.java
index a34b8e6..b1f8808 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class ResourcesTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        ResourcesType resourcesType = (ResourcesType) parentXMLObject;
+        final ResourcesType resourcesType = (ResourcesType) parentXMLObject;
         
         if (childXMLObject instanceof ResourceType){
             resourcesType.getResources().add((ResourceType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeMarshaller.java
index 2e9a1d7..89b4e79 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeMarshaller.java
@@ -33,7 +33,7 @@ public class RuleCombinerParametersTypeMarshaller extends AbstractXACMLObjectMar
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType)xmlObject;
+        final RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType)xmlObject;
         
         if(!Strings.isNullOrEmpty(ruleCombinerParametersType.getRuleIdRef())){
             domElement.setAttributeNS(null, RuleCombinerParametersType.RULE_ID_REF_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
index 1774f3e..6e7410d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class RuleCombinerParametersTypeUnmarshaller extends AbstractXACMLObjectU
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
       
         if(attribute.getLocalName().equals(RuleCombinerParametersType.RULE_ID_REF_ATTRIB_NAME)){
-            RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType)xmlObject;
+            final RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType)xmlObject;
             ruleCombinerParametersType.setRuleIdRef(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -47,7 +47,7 @@ public class RuleCombinerParametersTypeUnmarshaller extends AbstractXACMLObjectU
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType) parentXMLObject;
+        final RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType) parentXMLObject;
         
         if(childXMLObject instanceof CombinerParameterType){
             ruleCombinerParametersType.getCombinerParameters().add((CombinerParameterType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImpl.java
index 091cad9..d79430a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImpl.java
@@ -112,7 +112,7 @@ public class RuleTypeImpl extends AbstractXACMLObject implements RuleType {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         if(description != null){
             children.add(description);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeMarshaller.java
index 9af9e4c..d3a4095 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeMarshaller.java
@@ -34,7 +34,7 @@ public class RuleTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RuleType ruleType = (RuleType) xmlObject;
+        final RuleType ruleType = (RuleType) xmlObject;
 
         if (!Strings.isNullOrEmpty(ruleType.getRuleId())) {
             domElement.setAttributeNS(null, RuleType.RULE_ID_ATTRIB_NAME, ruleType.getRuleId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
index 748aebe..d4e8ad3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
@@ -37,7 +37,7 @@ public class RuleTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     /** {@inheritDoc} */
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RuleType ruleType = (RuleType) xmlObject;
+        final RuleType ruleType = (RuleType) xmlObject;
       
         if(attribute.getLocalName().equals(RuleType.EFFECT_ATTRIB_NAME)){
             ruleType.setEffect(EffectType.valueOf(
@@ -54,7 +54,7 @@ public class RuleTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        RuleType ruleType = (RuleType) parentXMLObject;
+        final RuleType ruleType = (RuleType) parentXMLObject;
         
         if(childXMLObject instanceof TargetType){
             ruleType.setTarget((TargetType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeMarshaller.java
index d5b2932..97cb558 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeMarshaller.java
@@ -32,7 +32,8 @@ public class SubjectAttributeDesignatorTypeMarshaller extends AttributeDesignato
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SubjectAttributeDesignatorType subjectAttributeDesignatorType = (SubjectAttributeDesignatorType) xmlObject;
+        final SubjectAttributeDesignatorType subjectAttributeDesignatorType =
+                (SubjectAttributeDesignatorType) xmlObject;
         
         if(!Strings.isNullOrEmpty(subjectAttributeDesignatorType.getSubjectCategory())){            
             domElement.setAttributeNS(null, SubjectAttributeDesignatorType.SUBJECT_CATEGORY_ATTRIB_NAME, 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
index 03395ec..13be74d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
@@ -33,7 +33,8 @@ public class SubjectAttributeDesignatorTypeUnmarshaller extends AttributeDesigna
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(SubjectAttributeDesignatorType.SUBJECT_CATEGORY_ATTRIB_NAME)){
-            SubjectAttributeDesignatorType subjectAttributeDesignatorType = (SubjectAttributeDesignatorType) xmlObject;
+            final SubjectAttributeDesignatorType subjectAttributeDesignatorType =
+                    (SubjectAttributeDesignatorType) xmlObject;
             subjectAttributeDesignatorType.setSubjectCategory(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImpl.java
index 643c7c6..d6358db 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImpl.java
@@ -56,7 +56,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
 
     /** {@inheritDoc} */
     public AttributeSelectorType getAttributeSelector() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeSelectorType.DEFAULT_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeSelectorType) selectors.get(0);
@@ -72,7 +72,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
 
     /** {@inheritDoc} */
     public AttributeDesignatorType getSubjectAttributeDesignator() {
-        List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
+        final List<XACMLObject> selectors = (List<XACMLObject>) attributeChoice
                 .subList(AttributeDesignatorType.SUBJECT_ATTRIBUTE_DESIGNATOR_ELEMENT_NAME);
         if (selectors != null && !selectors.isEmpty()) {
             return (AttributeDesignatorType) selectors.get(0);
@@ -88,7 +88,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
 
     /** {@inheritDoc} */
     public void setAttributeSelector(final AttributeSelectorType selector) {
-        AttributeSelectorType currentSelector = getAttributeSelector();
+        final AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
         }
@@ -103,7 +103,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
 
     /** {@inheritDoc} */
     public void setSubjectAttributeDesignator(final AttributeDesignatorType attribute) {
-        AttributeDesignatorType currentDesignator = getSubjectAttributeDesignator();
+        final AttributeDesignatorType currentDesignator = getSubjectAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
         }
@@ -118,7 +118,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.add(attributeValue);
         if (!attributeChoice.isEmpty()) {
             children.addAll(attributeChoice);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeMarshaller.java
index 93c40ea..4aa30bd 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeMarshaller.java
@@ -31,7 +31,7 @@ public class SubjectMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SubjectMatchType matchType = (SubjectMatchType) xmlObject;
+        final SubjectMatchType matchType = (SubjectMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(matchType.getMatchId())) {
             domElement.setAttributeNS(null, SubjectMatchType.MATCH_ID_ATTRIB_NAME, matchType.getMatchId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
index edd5af9..337d3ba 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
@@ -35,7 +35,7 @@ public class SubjectMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
     @Override
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(SubjectMatchType.MATCH_ID_ATTRIB_NAME)) {
-            SubjectMatchType matchType = (SubjectMatchType) xmlObject;
+            final SubjectMatchType matchType = (SubjectMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -46,7 +46,7 @@ public class SubjectMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        SubjectMatchType matchType = (SubjectMatchType) parentXMLObject;
+        final SubjectMatchType matchType = (SubjectMatchType) parentXMLObject;
     
         if (childXMLObject instanceof AttributeValueType) {
             matchType.setAttributeValue((AttributeValueType) childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImpl.java
index fe5fa69..0209ba6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImpl.java
@@ -54,7 +54,7 @@ public class SubjectTypeImpl extends AbstractXACMLObject implements SubjectType
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(subjectMatch);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeUnmarshaller.java
index 56ca821..9e00685 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        SubjectType subjectType = (SubjectType) parentXMLObject;
+        final SubjectType subjectType = (SubjectType) parentXMLObject;
         
         if(childXMLObject instanceof SubjectMatchType){
             subjectType.getSubjectMatches().add((SubjectMatchType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImpl.java
index 089e0ff..0e094a1 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImpl.java
@@ -53,7 +53,7 @@ public class SubjectsTypeImpl extends AbstractXACMLObject implements SubjectsTyp
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         
-        ArrayList<XMLObject> children = new ArrayList<>();        
+        final ArrayList<XMLObject> children = new ArrayList<>();        
         
         children.addAll(subject);      
                 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeUnmarshaller.java
index a424dbb..f21e530 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeUnmarshaller.java
@@ -32,7 +32,7 @@ public class SubjectsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        SubjectsType subjectsType = (SubjectsType) parentXMLObject;
+        final SubjectsType subjectsType = (SubjectsType) parentXMLObject;
         
         if(childXMLObject instanceof SubjectType){
             subjectsType.getSubjects().add((SubjectType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImpl.java
index 3852f92..d7f88e8 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImpl.java
@@ -60,7 +60,7 @@ public class TargetTypeImpl extends AbstractXACMLObject implements TargetType {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if(subjects != null){
             children.add(subjects);  
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeUnmarshaller.java
index 2496feb..b6c5e23 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class TargetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     @Override
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        TargetType targetType = (TargetType) parentXMLObject;
+        final TargetType targetType = (TargetType) parentXMLObject;
         
         if(childXMLObject.getElementQName().equals(ActionsType.DEFAULT_ELEMENT_NAME)){
             targetType.setActions((ActionsType)childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java
index 0aae695..242c48d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java
@@ -72,7 +72,7 @@ public class VariableDefinitionTypeImpl extends AbstractXACMLObject implements V
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if(expression != null){
             children.add(expression);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeMarshaller.java
index a7bf591..b8a0370 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeMarshaller.java
@@ -33,7 +33,7 @@ public class VariableDefinitionTypeMarshaller extends AbstractXACMLObjectMarshal
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
+        final VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
         
         if(!Strings.isNullOrEmpty(variableDefinitionType.getVariableId())){
             domElement.setAttributeNS(null, VariableDefinitionType.VARIABLE_ID_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
index 13f5548..1e22e9d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class VariableDefinitionTypeUnmarshaller extends AbstractXACMLObjectUnmar
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(VariableDefinitionType.VARIABLE_ID_ATTRIB_NAME)){
-            VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
+            final VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
             variableDefinitionType.setVariableId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -49,7 +49,7 @@ public class VariableDefinitionTypeUnmarshaller extends AbstractXACMLObjectUnmar
             throws UnmarshallingException {
         
         if(childXMLObject instanceof ExpressionType){
-            VariableDefinitionType variableDefinition= (VariableDefinitionType) parentXMLObject;
+            final VariableDefinitionType variableDefinition= (VariableDefinitionType) parentXMLObject;
             variableDefinition.setExpression((ExpressionType)childXMLObject);
         } else {
             super.processChildElement(parentXMLObject, childXMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImpl.java
index 314b001..84713a2 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImpl.java
@@ -67,7 +67,7 @@ public class VariableReferenceTypeImpl extends AbstractXACMLObject implements Va
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if(!expressions.isEmpty()){
             children.addAll(expressions);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeMarshaller.java
index cf2c9b1..adedfcc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeMarshaller.java
@@ -32,7 +32,7 @@ public class VariableReferenceTypeMarshaller extends AbstractXACMLObjectMarshall
     
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
+        final VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
         
         if(!Strings.isNullOrEmpty(variableReferenceType.getVariableId())){
             domElement.setAttributeNS(null, VariableReferenceType.VARIABLE_ID_ATTRIB_NAME,
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
index 05bb949..9e49135 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
@@ -36,7 +36,7 @@ public class VariableReferenceTypeUnmarshaller extends AbstractXACMLObjectUnmars
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(VariableReferenceType.VARIABLE_ID_ATTRIB_NAME)){
-            VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
+            final VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
             variableReferenceType.setVariableId(StringSupport.trimOrNull(attribute.getValue()));
         } else {
             super.processAttribute(xmlObject, attribute);
@@ -49,7 +49,7 @@ public class VariableReferenceTypeUnmarshaller extends AbstractXACMLObjectUnmars
             throws UnmarshallingException {
         
         if(childXMLObject instanceof ExpressionType){
-            VariableReferenceType variableReferenceType = (VariableReferenceType) parentXMLObject;
+            final VariableReferenceType variableReferenceType = (VariableReferenceType) parentXMLObject;
             variableReferenceType.getExpressions().add((ExpressionType)childXMLObject);
         } else {
             super.processChildElement(parentXMLObject, childXMLObject);

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


More information about the commits mailing list