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

Tom Zeller tzeller at dragonacea.biz
Thu Aug 10 18:25:54 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=6686c05db5b95360256c1e757aaf280dfb6c612f

commit 6686c05db5b95360256c1e757aaf280dfb6c612f
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 10 16:31:23 2017 -0500

    JPAR-85 - Checkstyle, check final parameters
---
 .../org/opensaml/xacml/ctx/impl/ActionTypeImpl.java   |  2 +-
 .../xacml/ctx/impl/ActionTypeImplBuilder.java         |  2 +-
 .../xacml/ctx/impl/ActionTypeUnmarshaller.java        |  3 ++-
 .../opensaml/xacml/ctx/impl/AttributeTypeImpl.java    |  9 +++++----
 .../xacml/ctx/impl/AttributeTypeImplBuilder.java      |  2 +-
 .../xacml/ctx/impl/AttributeTypeMarshaller.java       |  3 ++-
 .../xacml/ctx/impl/AttributeTypeUnmarshaller.java     |  5 +++--
 .../xacml/ctx/impl/AttributeValueTypeImpl.java        |  7 ++++---
 .../xacml/ctx/impl/AttributeValueTypeImplBuilder.java |  3 ++-
 .../xacml/ctx/impl/AttributeValueTypeMarshaller.java  |  5 +++--
 .../ctx/impl/AttributeValueTypeUnmarshaller.java      |  6 +++---
 .../org/opensaml/xacml/ctx/impl/DecisionTypeImpl.java |  4 ++--
 .../xacml/ctx/impl/DecisionTypeImplBuilder.java       |  2 +-
 .../xacml/ctx/impl/DecisionTypeMarshaller.java        |  3 ++-
 .../xacml/ctx/impl/DecisionTypeUnmarshaller.java      |  2 +-
 .../opensaml/xacml/ctx/impl/EnvironmentTypeImpl.java  |  3 ++-
 .../xacml/ctx/impl/EnvironmentTypeImplBuilder.java    |  3 ++-
 .../xacml/ctx/impl/EnvironmentTypeUnmarshaller.java   |  3 ++-
 .../ctx/impl/MissingAttributeDetailTypeImpl.java      |  9 +++++----
 .../impl/MissingAttributeDetailTypeImplBuilder.java   |  3 ++-
 .../impl/MissingAttributeDetailTypeMarshaller.java    |  2 +-
 .../impl/MissingAttributeDetailTypeUnmarshaller.java  |  4 ++--
 .../org/opensaml/xacml/ctx/impl/RequestTypeImpl.java  |  6 +++---
 .../xacml/ctx/impl/RequestTypeImplBuilder.java        |  2 +-
 .../xacml/ctx/impl/RequestTypeUnmarshaller.java       |  2 +-
 .../xacml/ctx/impl/ResourceContentTypeImpl.java       |  7 ++++---
 .../ctx/impl/ResourceContentTypeImplBuilder.java      |  3 ++-
 .../xacml/ctx/impl/ResourceContentTypeMarshaller.java |  5 +++--
 .../ctx/impl/ResourceContentTypeUnmarshaller.java     |  6 +++---
 .../org/opensaml/xacml/ctx/impl/ResourceTypeImpl.java |  4 ++--
 .../xacml/ctx/impl/ResourceTypeImplBuilder.java       |  2 +-
 .../xacml/ctx/impl/ResourceTypeUnmarshaller.java      |  3 ++-
 .../org/opensaml/xacml/ctx/impl/ResponseTypeImpl.java |  2 +-
 .../xacml/ctx/impl/ResponseTypeImplBuilder.java       |  2 +-
 .../xacml/ctx/impl/ResponseTypeUnmarshaller.java      |  2 +-
 .../org/opensaml/xacml/ctx/impl/ResultTypeImpl.java   | 10 +++++-----
 .../xacml/ctx/impl/ResultTypeImplBuilder.java         |  2 +-
 .../opensaml/xacml/ctx/impl/ResultTypeMarshaller.java |  3 ++-
 .../xacml/ctx/impl/ResultTypeUnmarshaller.java        |  5 +++--
 .../opensaml/xacml/ctx/impl/StatusCodeTypeImpl.java   |  7 ++++---
 .../xacml/ctx/impl/StatusCodeTypeImplBuilder.java     |  2 +-
 .../xacml/ctx/impl/StatusCodeTypeMarshaller.java      |  3 ++-
 .../xacml/ctx/impl/StatusCodeTypeUnmarshaller.java    |  5 +++--
 .../opensaml/xacml/ctx/impl/StatusDetailTypeImpl.java |  5 +++--
 .../xacml/ctx/impl/StatusDetailTypeImplBuilder.java   |  3 ++-
 .../xacml/ctx/impl/StatusDetailTypeUnmarshaller.java  |  2 +-
 .../xacml/ctx/impl/StatusMessageTypeImpl.java         |  5 +++--
 .../xacml/ctx/impl/StatusMessageTypeImplBuilder.java  |  3 ++-
 .../xacml/ctx/impl/StatusMessageTypeMarshaller.java   |  5 +++--
 .../xacml/ctx/impl/StatusMessageTypeUnmarshaller.java |  2 +-
 .../org/opensaml/xacml/ctx/impl/StatusTypeImpl.java   |  8 ++++----
 .../xacml/ctx/impl/StatusTypeImplBuilder.java         |  2 +-
 .../xacml/ctx/impl/StatusTypeUnmarshaller.java        |  3 ++-
 .../org/opensaml/xacml/ctx/impl/SubjectTypeImpl.java  |  4 ++--
 .../xacml/ctx/impl/SubjectTypeImplBuilder.java        |  2 +-
 .../xacml/ctx/impl/SubjectTypeMarshaller.java         |  3 ++-
 .../xacml/ctx/impl/SubjectTypeUnmarshaller.java       |  5 +++--
 .../ctx/provider/impl/BaseObligationHandler.java      |  6 +++---
 .../provider/impl/ObligationProcessingContext.java    |  2 +-
 .../provider/impl/ObligationProcessingException.java  |  6 +++---
 .../xacml/ctx/provider/impl/ObligationService.java    | 12 ++++++------
 .../org/opensaml/xacml/impl/AbstractXACMLObject.java  |  3 ++-
 .../xacml/impl/AbstractXACMLObjectMarshaller.java     |  5 +++--
 .../xacml/impl/AbstractXACMLObjectUnmarshaller.java   |  6 +++---
 .../xacml/policy/impl/ActionMatchTypeImpl.java        | 10 +++++-----
 .../xacml/policy/impl/ActionMatchTypeImplBuilder.java |  3 ++-
 .../xacml/policy/impl/ActionMatchTypeMarshaller.java  |  2 +-
 .../policy/impl/ActionMatchTypeUnmarshaller.java      |  4 ++--
 .../opensaml/xacml/policy/impl/ActionTypeImpl.java    |  2 +-
 .../xacml/policy/impl/ActionTypeImplBuilder.java      |  2 +-
 .../xacml/policy/impl/ActionTypeUnmarshaller.java     |  2 +-
 .../opensaml/xacml/policy/impl/ActionsTypeImpl.java   |  2 +-
 .../xacml/policy/impl/ActionsTypeImplBuilder.java     |  2 +-
 .../xacml/policy/impl/ActionsTypeUnmarshaller.java    |  2 +-
 .../org/opensaml/xacml/policy/impl/ApplyTypeImpl.java |  4 ++--
 .../xacml/policy/impl/ApplyTypeImplBuilder.java       |  2 +-
 .../xacml/policy/impl/ApplyTypeMarshaller.java        |  2 +-
 .../xacml/policy/impl/ApplyTypeUnmarshaller.java      |  4 ++--
 .../policy/impl/AttributeAssignmentTypeImpl.java      |  5 +++--
 .../impl/AttributeAssignmentTypeImplBuilder.java      |  3 ++-
 .../impl/AttributeAssignmentTypeMarshaller.java       |  3 ++-
 .../impl/AttributeAssignmentTypeUnmarshaller.java     |  2 +-
 .../policy/impl/AttributeDesignatorTypeImpl.java      | 13 +++++++------
 .../impl/AttributeDesignatorTypeImplBuilder.java      |  3 ++-
 .../impl/AttributeDesignatorTypeMarshaller.java       |  2 +-
 .../impl/AttributeDesignatorTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/AttributeSelectorTypeImpl.java  | 11 ++++++-----
 .../policy/impl/AttributeSelectorTypeImplBuilder.java |  3 ++-
 .../policy/impl/AttributeSelectorTypeMarshaller.java  |  2 +-
 .../impl/AttributeSelectorTypeUnmarshaller.java       |  2 +-
 .../xacml/policy/impl/AttributeValueTypeImpl.java     |  9 +++++----
 .../policy/impl/AttributeValueTypeImplBuilder.java    |  3 ++-
 .../policy/impl/AttributeValueTypeMarshaller.java     |  5 +++--
 .../policy/impl/AttributeValueTypeUnmarshaller.java   |  6 +++---
 .../xacml/policy/impl/CombinerParameterTypeImpl.java  |  7 ++++---
 .../policy/impl/CombinerParameterTypeImplBuilder.java |  3 ++-
 .../policy/impl/CombinerParameterTypeMarshaller.java  |  2 +-
 .../impl/CombinerParameterTypeUnmarshaller.java       |  4 ++--
 .../xacml/policy/impl/CombinerParametersTypeImpl.java |  3 ++-
 .../impl/CombinerParametersTypeImplBuilder.java       |  3 ++-
 .../impl/CombinerParametersTypeUnmarshaller.java      |  2 +-
 .../opensaml/xacml/policy/impl/ConditionTypeImpl.java |  4 ++--
 .../xacml/policy/impl/ConditionTypeImplBuilder.java   |  2 +-
 .../xacml/policy/impl/ConditionTypeUnmarshaller.java  |  2 +-
 .../opensaml/xacml/policy/impl/DefaultsTypeImpl.java  |  4 ++--
 .../xacml/policy/impl/DefaultsTypeImplBuilder.java    |  2 +-
 .../xacml/policy/impl/DefaultsTypeUnmarshaller.java   |  2 +-
 .../xacml/policy/impl/DescriptionTypeImpl.java        |  5 +++--
 .../xacml/policy/impl/DescriptionTypeImplBuilder.java |  3 ++-
 .../xacml/policy/impl/DescriptionTypeMarshaller.java  |  3 ++-
 .../policy/impl/DescriptionTypeUnmarshaller.java      |  2 +-
 .../xacml/policy/impl/EnvironmentMatchTypeImpl.java   | 11 ++++++-----
 .../policy/impl/EnvironmentMatchTypeImplBuilder.java  |  3 ++-
 .../policy/impl/EnvironmentMatchTypeMarshaller.java   |  2 +-
 .../policy/impl/EnvironmentMatchTypeUnmarshaller.java |  4 ++--
 .../xacml/policy/impl/EnvironmentTypeImpl.java        |  3 ++-
 .../xacml/policy/impl/EnvironmentTypeImplBuilder.java |  3 ++-
 .../policy/impl/EnvironmentTypeUnmarshaller.java      |  2 +-
 .../xacml/policy/impl/EnvironmentsTypeImpl.java       |  3 ++-
 .../policy/impl/EnvironmentsTypeImplBuilder.java      |  3 ++-
 .../policy/impl/EnvironmentsTypeUnmarshaller.java     |  2 +-
 .../opensaml/xacml/policy/impl/FunctionTypeImpl.java  |  4 ++--
 .../xacml/policy/impl/FunctionTypeImplBuilder.java    |  2 +-
 .../xacml/policy/impl/FunctionTypeMarshaller.java     |  2 +-
 .../xacml/policy/impl/FunctionTypeUnmarshaller.java   |  2 +-
 .../xacml/policy/impl/IdReferenceTypeImpl.java        |  9 +++++----
 .../xacml/policy/impl/IdReferenceTypeImplBuilder.java |  3 ++-
 .../xacml/policy/impl/IdReferenceTypeMarshaller.java  |  2 +-
 .../policy/impl/IdReferenceTypeUnmarshaller.java      |  2 +-
 .../xacml/policy/impl/ObligationTypeImpl.java         |  7 ++++---
 .../xacml/policy/impl/ObligationTypeImplBuilder.java  |  2 +-
 .../xacml/policy/impl/ObligationTypeMarshaller.java   |  3 ++-
 .../xacml/policy/impl/ObligationTypeUnmarshaller.java |  5 +++--
 .../xacml/policy/impl/ObligationsTypeImpl.java        |  3 ++-
 .../xacml/policy/impl/ObligationsTypeImplBuilder.java |  3 ++-
 .../policy/impl/ObligationsTypeUnmarshaller.java      |  3 ++-
 .../policy/impl/PolicyCombinerParametersTypeImpl.java |  5 +++--
 .../impl/PolicyCombinerParametersTypeImplBuilder.java |  3 ++-
 .../impl/PolicyCombinerParametersTypeMarshaller.java  |  2 +-
 .../PolicyCombinerParametersTypeUnmarshaller.java     |  2 +-
 .../impl/PolicySetCombinerParametersTypeImpl.java     |  7 ++++---
 .../PolicySetCombinerParametersTypeImplBuilder.java   |  3 ++-
 .../PolicySetCombinerParametersTypeMarshaller.java    |  2 +-
 .../PolicySetCombinerParametersTypeUnmarshaller.java  |  2 +-
 .../opensaml/xacml/policy/impl/PolicySetTypeImpl.java | 19 ++++++++++---------
 .../xacml/policy/impl/PolicySetTypeImplBuilder.java   |  2 +-
 .../xacml/policy/impl/PolicySetTypeMarshaller.java    |  2 +-
 .../xacml/policy/impl/PolicySetTypeUnmarshaller.java  |  4 ++--
 .../opensaml/xacml/policy/impl/PolicyTypeImpl.java    | 16 ++++++++--------
 .../xacml/policy/impl/PolicyTypeImplBuilder.java      |  2 +-
 .../xacml/policy/impl/PolicyTypeMarshaller.java       |  2 +-
 .../xacml/policy/impl/PolicyTypeUnmarshaller.java     |  4 ++--
 .../xacml/policy/impl/ResourceMatchTypeImpl.java      | 11 ++++++-----
 .../policy/impl/ResourceMatchTypeImplBuilder.java     |  3 ++-
 .../policy/impl/ResourceMatchTypeMarshaller.java      |  2 +-
 .../policy/impl/ResourceMatchTypeUnmarshaller.java    |  4 ++--
 .../opensaml/xacml/policy/impl/ResourceTypeImpl.java  |  2 +-
 .../xacml/policy/impl/ResourceTypeImplBuilder.java    |  2 +-
 .../xacml/policy/impl/ResourceTypeUnmarshaller.java   |  2 +-
 .../opensaml/xacml/policy/impl/ResourcesTypeImpl.java |  2 +-
 .../xacml/policy/impl/ResourcesTypeImplBuilder.java   |  2 +-
 .../xacml/policy/impl/ResourcesTypeUnmarshaller.java  |  2 +-
 .../policy/impl/RuleCombinerParametersTypeImpl.java   |  5 +++--
 .../impl/RuleCombinerParametersTypeImplBuilder.java   |  3 ++-
 .../impl/RuleCombinerParametersTypeMarshaller.java    |  2 +-
 .../impl/RuleCombinerParametersTypeUnmarshaller.java  |  4 ++--
 .../org/opensaml/xacml/policy/impl/RuleTypeImpl.java  | 12 ++++++------
 .../xacml/policy/impl/RuleTypeImplBuilder.java        |  2 +-
 .../xacml/policy/impl/RuleTypeMarshaller.java         |  2 +-
 .../xacml/policy/impl/RuleTypeUnmarshaller.java       |  4 ++--
 .../impl/SubjectAttributeDesignatorTypeImpl.java      |  5 +++--
 .../SubjectAttributeDesignatorTypeImplBuilder.java    |  5 +++--
 .../SubjectAttributeDesignatorTypeMarshaller.java     |  2 +-
 .../SubjectAttributeDesignatorTypeUnmarshaller.java   |  2 +-
 .../xacml/policy/impl/SubjectMatchTypeImpl.java       | 11 ++++++-----
 .../policy/impl/SubjectMatchTypeImplBuilder.java      |  3 ++-
 .../xacml/policy/impl/SubjectMatchTypeMarshaller.java |  2 +-
 .../policy/impl/SubjectMatchTypeUnmarshaller.java     |  4 ++--
 .../opensaml/xacml/policy/impl/SubjectTypeImpl.java   |  2 +-
 .../xacml/policy/impl/SubjectTypeImplBuilder.java     |  2 +-
 .../xacml/policy/impl/SubjectTypeUnmarshaller.java    |  2 +-
 .../opensaml/xacml/policy/impl/SubjectsTypeImpl.java  |  2 +-
 .../xacml/policy/impl/SubjectsTypeImplBuilder.java    |  2 +-
 .../xacml/policy/impl/SubjectsTypeUnmarshaller.java   |  2 +-
 .../opensaml/xacml/policy/impl/TargetTypeImpl.java    | 10 +++++-----
 .../xacml/policy/impl/TargetTypeImplBuilder.java      |  2 +-
 .../xacml/policy/impl/TargetTypeUnmarshaller.java     |  2 +-
 .../xacml/policy/impl/VariableDefinitionTypeImpl.java |  7 ++++---
 .../impl/VariableDefinitionTypeImplBuilder.java       |  3 ++-
 .../policy/impl/VariableDefinitionTypeMarshaller.java |  2 +-
 .../impl/VariableDefinitionTypeUnmarshaller.java      |  4 ++--
 .../xacml/policy/impl/VariableReferenceTypeImpl.java  |  5 +++--
 .../policy/impl/VariableReferenceTypeImplBuilder.java |  3 ++-
 .../policy/impl/VariableReferenceTypeMarshaller.java  |  2 +-
 .../impl/VariableReferenceTypeUnmarshaller.java       |  4 ++--
 195 files changed, 416 insertions(+), 335 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 1922bc7..d825ad4 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
@@ -40,7 +40,7 @@ public class ActionTypeImpl extends AbstractXACMLObject implements ActionType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ActionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImplBuilder.java
index 5ab211e..60b120a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ActionTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class ActionTypeImplBuilder extends AbstractXACMLObjectBuilder<ActionType
     }
 
     /** {@inheritDoc} */
-    public ActionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ActionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
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 d01fa7b..ad70cfd 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
@@ -32,7 +32,8 @@ public class ActionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         ActionType action = (ActionType) parentObject;
 
         if (childObject instanceof AttributeType) {
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 3b047e9..4af27f6 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
@@ -49,7 +49,8 @@ public class AttributeTypeImpl extends AbstractXACMLObject implements AttributeT
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeValues = new XMLObjectChildrenList<>(this);
     }
@@ -70,17 +71,17 @@ public class AttributeTypeImpl extends AbstractXACMLObject implements AttributeT
     }
 
     /** {@inheritDoc} */
-    public void setAttributeID(String attributeId) {
+    public void setAttributeID(final String attributeId) {
         this.attributeID = prepareForAssignment(this.attributeID, attributeId);
     }
 
     /** {@inheritDoc} */
-    public void setDataType(String type) {
+    public void setDataType(final String type) {
         datatype = prepareForAssignment(datatype, type);
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(String iss) {
+    public void setIssuer(final String iss) {
         issuer = prepareForAssignment(issuer, iss);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImplBuilder.java
index 4ec117e..82454fc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class AttributeTypeImplBuilder extends AbstractXACMLObjectBuilder<Attribu
     }
 
     /** {@inheritDoc} */
-    public AttributeType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 05b42a7..2e14dea 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
@@ -32,7 +32,8 @@ public class AttributeTypeMarshaller extends AbstractXACMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         AttributeType attribute = (AttributeType) samlElement;
 
         if (attribute.getIssuer() != null) {
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 5e323f8..87cb242 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
@@ -33,7 +33,8 @@ public class AttributeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         AttributeType attribute = (AttributeType) parentObject;
      
         if (childObject instanceof AttributeValueType) {
@@ -44,7 +45,7 @@ public class AttributeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
         AttributeType attrib = (AttributeType) xmlObject;
 
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 17fa463..af42ff4 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
@@ -48,7 +48,8 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeValueTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeValueTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         unknownElements = new IndexedXMLObjectChildrenList<>(this);
@@ -71,7 +72,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownElements.subList(typeOrName);
     }
 
@@ -86,7 +87,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public void setValue(String value) {
+    public void setValue(final String value) {
         textContent = prepareForAssignment(textContent, value);
     }
 }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImplBuilder.java
index f1d0557..d1c06af 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeImplBuilder.java
@@ -34,7 +34,8 @@ public class AttributeValueTypeImplBuilder extends AbstractXACMLObjectBuilder<At
     }
 
     /** {@inheritDoc} */
-    public AttributeValueType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeValueType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new AttributeValueTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 b12a99f..f55411f 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
@@ -34,14 +34,15 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         marshallUnknownAttributes(attributeValue, domElement);
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if (attributeValue.getValue() != null) {
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 1830056..de3ced6 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
@@ -34,14 +34,14 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         processUnknownAttribute(attributeValue, attribute);
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
        
         AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
@@ -49,7 +49,7 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
    }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
         attributeValue.setValue(StringSupport.trimOrNull(elementContent));
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImpl.java
index 2a19c82..e20b800 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImpl.java
@@ -37,7 +37,7 @@ public class DecisionTypeImpl extends AbstractXACMLObject implements DecisionTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DecisionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DecisionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class DecisionTypeImpl extends AbstractXACMLObject implements DecisionTyp
     }
 
     /** {@inheritDoc} */
-    public void setDecision(DECISION dec) {
+    public void setDecision(final DECISION dec) {
         decision = prepareForAssignment(decision, dec);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImplBuilder.java
index 9f91b8f..c115e28 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/DecisionTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class DecisionTypeImplBuilder extends AbstractXACMLObjectBuilder<Decision
     }
 
     /** {@inheritDoc} */
-    public DecisionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DecisionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DecisionTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ 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 7969959..f6864c6 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
@@ -34,7 +34,8 @@ public class DecisionTypeMarshaller extends AbstractXACMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
         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 afa57d7..db22ce9 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
@@ -31,7 +31,7 @@ public class DecisionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         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 b27b712..6558cea 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
@@ -40,7 +40,8 @@ public class EnvironmentTypeImpl extends AbstractXACMLObject implements Environm
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EnvironmentTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EnvironmentTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImplBuilder.java
index 6115f9d..58c1c7e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/EnvironmentTypeImplBuilder.java
@@ -34,7 +34,8 @@ public class EnvironmentTypeImplBuilder extends AbstractXACMLObjectBuilder<Envir
     }
 
     /** {@inheritDoc} */
-    public EnvironmentType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EnvironmentType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EnvironmentTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 e749379..04cf95b 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
@@ -32,7 +32,8 @@ public class EnvironmentTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         EnvironmentType environment = (EnvironmentType) parentObject;
        
         if (childObject instanceof AttributeType) {
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 a487a01..29ccdea 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
@@ -49,7 +49,8 @@ public class MissingAttributeDetailTypeImpl extends AbstractXACMLObject implemen
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected MissingAttributeDetailTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected MissingAttributeDetailTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeValues = new XMLObjectChildrenList<>(this);
     }
@@ -84,17 +85,17 @@ public class MissingAttributeDetailTypeImpl extends AbstractXACMLObject implemen
     }
 
     /** {@inheritDoc} */
-    public void setAttributeId(String id) {
+    public void setAttributeId(final String id) {
         attributeId = prepareForAssignment(attributeId, id);
     }
 
     /** {@inheritDoc} */
-    public void setDataType(String type) {
+    public void setDataType(final String type) {
         dataType = prepareForAssignment(dataType, type);
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(String iss) {
+    public void setIssuer(final String iss) {
         issuer = prepareForAssignment(issuer, iss);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImplBuilder.java
index 3613f29..71a6c83 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/MissingAttributeDetailTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class MissingAttributeDetailTypeImplBuilder extends AbstractXACMLObjectBu
     }
 
     /** {@inheritDoc} */
-    public MissingAttributeDetailType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public MissingAttributeDetailType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new MissingAttributeDetailTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 fba5aa5..0f04941 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
@@ -32,7 +32,7 @@ public class MissingAttributeDetailTypeMarshaller extends AbstractXACMLObjectMar
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
 
         if (madt.getAttributeId() != null) {
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 0efab83..41fab23 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
@@ -33,7 +33,7 @@ public class MissingAttributeDetailTypeUnmarshaller extends AbstractXACMLObjectU
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         MissingAttributeDetailType madt = (MissingAttributeDetailType) xmlObject;
 
         if (attribute.getLocalName().equals(MissingAttributeDetailType.ATTRIBUTE_ID_ATTRIB_NAME)) {
@@ -48,7 +48,7 @@ public class MissingAttributeDetailTypeUnmarshaller extends AbstractXACMLObjectU
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         MissingAttributeDetailType madt = (MissingAttributeDetailType) parentXMLObject;
         if (childXMLObject instanceof AttributeValueType) {
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 f918bb6..98f565d 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
@@ -52,7 +52,7 @@ public class RequestTypeImpl extends AbstractXACMLObject implements RequestType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         subjects = new XMLObjectChildrenList<>(this);
         resources = new XMLObjectChildrenList<>(this);
@@ -74,7 +74,7 @@ public class RequestTypeImpl extends AbstractXACMLObject implements RequestType
     }
 
     /** {@inheritDoc} */
-    public void setEnvironment(EnvironmentType env) {
+    public void setEnvironment(final EnvironmentType env) {
         environment = prepareForAssignment(environment, env);
     }
 
@@ -84,7 +84,7 @@ public class RequestTypeImpl extends AbstractXACMLObject implements RequestType
     }
 
     /** {@inheritDoc} */
-    public void setAction(ActionType act) {
+    public void setAction(final ActionType act) {
         action = prepareForAssignment(action, act);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImplBuilder.java
index 0ee6c5d..326d685 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/RequestTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class RequestTypeImplBuilder extends AbstractXACMLObjectBuilder<RequestTy
     }
 
     /** {@inheritDoc} */
-    public RequestType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequestType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 a94c4f7..b994b8d 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
@@ -35,7 +35,7 @@ public class RequestTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         RequestType request = (RequestType) parentXMLObject;
 
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 b28be6b..e88679b 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
@@ -48,7 +48,8 @@ public class ResourceContentTypeImpl extends AbstractXACMLObject implements Reso
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResourceContentTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResourceContentTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         unknownElements = new IndexedXMLObjectChildrenList<>(this);
@@ -69,7 +70,7 @@ public class ResourceContentTypeImpl extends AbstractXACMLObject implements Reso
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownElements.subList(typeOrName);
     }
 
@@ -84,7 +85,7 @@ public class ResourceContentTypeImpl extends AbstractXACMLObject implements Reso
     }
     
     /** {@inheritDoc} */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         value = prepareForAssignment(value, newValue);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImplBuilder.java
index 3c89c20..e9ad184 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class ResourceContentTypeImplBuilder extends AbstractXACMLObjectBuilder<R
     }
 
     /** {@inheritDoc} */
-    public ResourceContentType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResourceContentType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new ResourceContentTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 dd0e31c..ad3056f 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
@@ -34,14 +34,15 @@ public class ResourceContentTypeMarshaller extends AbstractXACMLObjectMarshaller
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ResourceContentType resourceContent  = (ResourceContentType)xmlObject;
         
         marshallUnknownAttributes(resourceContent, domElement);
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         ResourceContentType resourceContent = (ResourceContentType) xmlObject;
         
         if(resourceContent.getValue() != null){
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 43feb9c..02b585d 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
@@ -34,21 +34,21 @@ public class ResourceContentTypeUnmarshaller extends AbstractXACMLObjectUnmarsha
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         ResourceContentType resourceContent = (ResourceContentType) xmlObject;
 
         processUnknownAttribute(resourceContent, attribute);
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ResourceContentType resourceContent = (ResourceContentType) parentXMLObject;
         resourceContent.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         ResourceContentType resourceContent = (ResourceContentType) xmlObject;
         resourceContent.setValue(StringSupport.trimOrNull(elementContent));
     }
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 276b465..44005b5 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
@@ -44,7 +44,7 @@ public class ResourceTypeImpl extends AbstractXACMLObject implements ResourceTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResourceTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResourceTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
     }
@@ -70,7 +70,7 @@ public class ResourceTypeImpl extends AbstractXACMLObject implements ResourceTyp
     }
 
     /** {@inheritDoc} */
-    public void setResourceContent(ResourceContentType content) {
+    public void setResourceContent(final ResourceContentType content) {
         resourceContent = prepareForAssignment(resourceContent, content);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImplBuilder.java
index d5e9513..9766809 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceTypeImplBuilder.java
@@ -35,7 +35,7 @@ public class ResourceTypeImplBuilder extends AbstractXACMLObjectBuilder<Resource
     }
 
     /** {@inheritDoc} */
-    public ResourceType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResourceType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResourceTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 9356d1e..fe229d2 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
@@ -33,7 +33,8 @@ public class ResourceTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         ResourceType resource = (ResourceType) parentObject;
 
         if (childObject instanceof ResourceContentType) {
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 011f3f0..72233f9 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
@@ -40,7 +40,7 @@ public class ResponseTypeImpl extends AbstractXACMLObject implements ResponseTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResponseTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResponseTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         results = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImplBuilder.java
index ff0a7d3..22193f8 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResponseTypeImplBuilder.java
@@ -35,7 +35,7 @@ public class ResponseTypeImplBuilder extends AbstractXACMLObjectBuilder<Response
     }
 
     /** {@inheritDoc} */
-    public ResponseType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResponseType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResponseTypeImpl(namespaceURI, localName, XACMLConstants.XACMLCONTEXT_PREFIX);
     }
 }
\ No newline at end of file
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 02a6f52..df18903 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
@@ -32,7 +32,7 @@ public class ResponseTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ResponseType response = (ResponseType) parentXMLObject;
         if (childXMLObject instanceof ResultType) {
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 5f211c2..782afb1 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
@@ -50,7 +50,7 @@ public class ResultTypeImpl extends AbstractXACMLObject implements ResultType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResultTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResultTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -65,7 +65,7 @@ public class ResultTypeImpl extends AbstractXACMLObject implements ResultType {
     }
 
     /** {@inheritDoc} */
-    public void setObligations(ObligationsType obligationsIn) {
+    public void setObligations(final ObligationsType obligationsIn) {
         this.obligations = prepareForAssignment(this.obligations, obligationsIn);
     }
 
@@ -80,17 +80,17 @@ public class ResultTypeImpl extends AbstractXACMLObject implements ResultType {
     }
 
     /** {@inheritDoc} */
-    public void setStatus(StatusType statusIn) {
+    public void setStatus(final StatusType statusIn) {
         this.status = prepareForAssignment(this.status, statusIn);
     }
 
     /** {@inheritDoc} */
-    public void setDecision(DecisionType decisionIn) {
+    public void setDecision(final DecisionType decisionIn) {
         this.decision = prepareForAssignment(this.decision, decisionIn);
     }
 
     /** {@inheritDoc} */
-    public void setResourceId(String newResourceId) {
+    public void setResourceId(final String newResourceId) {
         resourceId = prepareForAssignment(this.resourceId, newResourceId);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImplBuilder.java
index 8c74983..361bcaa 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResultTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class ResultTypeImplBuilder extends AbstractXACMLObjectBuilder<ResultType
     }
 
     /** {@inheritDoc} */
-    public ResultType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResultType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResultTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 e0ab9e6..9be0a05 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
@@ -32,7 +32,8 @@ public class ResultTypeMarshaller extends AbstractXACMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         ResultType result = (ResultType) samlElement;
 
         if (result.getResourceId() != null) {
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 9f0accc..07a1bf3 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
@@ -35,7 +35,7 @@ public class ResultTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         ResultType result = (ResultType) xmlObject;
         if (attribute.getLocalName().equals(ResultType.RESOURCE_ID_ATTTRIB_NAME)) {
             result.setResourceId(attribute.getValue());
@@ -45,7 +45,8 @@ public class ResultTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         ResultType result = (ResultType) parentObject;
 
         if (childObject instanceof ObligationsType) {
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 f3d73a2..cb7da7f 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
@@ -41,7 +41,8 @@ public class StatusCodeTypeImpl extends AbstractXACMLObject implements StatusCod
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusCodeTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusCodeTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -67,12 +68,12 @@ public class StatusCodeTypeImpl extends AbstractXACMLObject implements StatusCod
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCodeType code) {
+    public void setStatusCode(final StatusCodeType code) {
         statusCode = prepareForAssignment(statusCode, code);
     }
 
     /** {@inheritDoc} */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         this.value = prepareForAssignment(this.value, newValue);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImplBuilder.java
index f928a17..86ca1a5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusCodeTypeImplBuilder.java
@@ -33,7 +33,7 @@ public class StatusCodeTypeImplBuilder extends AbstractXACMLObjectBuilder<Status
     }
 
     /** {@inheritDoc} */
-    public StatusCodeType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusCodeType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusCodeTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 a78c23f..03b5138 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
@@ -32,7 +32,8 @@ public class StatusCodeTypeMarshaller extends AbstractXACMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         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 9fa1b99..ac3ae5f 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
@@ -32,7 +32,7 @@ public class StatusCodeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         StatusCodeType statusCode = (StatusCodeType) xmlObject;
         if (attribute.getLocalName().equals(StatusCodeType.VALUE_ATTTRIB_NAME)) {
             statusCode.setValue(attribute.getValue());
@@ -42,7 +42,8 @@ public class StatusCodeTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         StatusCodeType statuscode = (StatusCodeType) parentObject;
         if (childObject instanceof StatusCodeType) {
             statuscode.setStatusCode((StatusCodeType) childObject);
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 c27d0ec..7450027 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
@@ -41,7 +41,8 @@ public class StatusDetailTypeImpl extends AbstractXACMLObject implements StatusD
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusDetailTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusDetailTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -61,7 +62,7 @@ public class StatusDetailTypeImpl extends AbstractXACMLObject implements StatusD
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImplBuilder.java
index f66f53e..399ed6e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusDetailTypeImplBuilder.java
@@ -34,7 +34,8 @@ public class StatusDetailTypeImplBuilder extends AbstractXACMLObjectBuilder<Stat
     }
 
     /** {@inheritDoc} */
-    public StatusDetailType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusDetailType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new StatusDetailTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 c11986c..f911f03 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
@@ -33,7 +33,7 @@ public class StatusDetailTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         StatusDetailType statusDetail = (StatusDetailType) parentSAMLObject;
         statusDetail.getUnknownXMLObjects().add(childSAMLObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImpl.java
index 1a0d165..593eb48 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImpl.java
@@ -37,7 +37,8 @@ public class StatusMessageTypeImpl extends AbstractXACMLObject implements Status
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusMessageTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusMessageTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -47,7 +48,7 @@ public class StatusMessageTypeImpl extends AbstractXACMLObject implements Status
     }
 
     /** {@inheritDoc} */
-    public void setValue(String newMessage) {
+    public void setValue(final String newMessage) {
         message = prepareForAssignment(message,newMessage); 
 
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImplBuilder.java
index 6693820..0ef4fe3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusMessageTypeImplBuilder.java
@@ -40,7 +40,8 @@ public class StatusMessageTypeImplBuilder extends AbstractXACMLObjectBuilder<Sta
     }
 
     /** {@inheritDoc} */
-    public StatusMessageType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusMessageType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new StatusMessageTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 0c9f918..d984ef6 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
@@ -26,12 +26,13 @@ import org.opensaml.xacml.impl.AbstractXACMLObjectMarshaller;
 import org.w3c.dom.Element;
 
 /**
- *Masrhaller for {@link org.opensaml.xacml.ctx.StatusMessageType}. 
+ * Marshaller for {@link org.opensaml.xacml.ctx.StatusMessageType}. 
  */
 public class StatusMessageTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         StatusMessageType message = (StatusMessageType)xmlObject;
 
         if(message.getValue() != null){
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 57e006a..cec3159 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
@@ -27,7 +27,7 @@ import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 public class StatusMessageTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String content) {
+    protected void processElementContent(final XMLObject xmlObject, final String content) {
         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 630aa0a..6b029ea 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
@@ -47,7 +47,7 @@ public class StatusTypeImpl extends AbstractXACMLObject implements StatusType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class StatusTypeImpl extends AbstractXACMLObject implements StatusType {
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCodeType newStatusCode) {
+    public void setStatusCode(final StatusCodeType newStatusCode) {
         statusCode = prepareForAssignment(this.statusCode, newStatusCode);
     }
 
@@ -86,7 +86,7 @@ public class StatusTypeImpl extends AbstractXACMLObject implements StatusType {
     }
 
     /** {@inheritDoc} */
-    public void setStatusMessage(StatusMessageType newStatusMessage) {
+    public void setStatusMessage(final StatusMessageType newStatusMessage) {
         this.statusMessage = prepareForAssignment(this.statusMessage, newStatusMessage);
     }
 
@@ -96,7 +96,7 @@ public class StatusTypeImpl extends AbstractXACMLObject implements StatusType {
     }
 
     /** {@inheritDoc} */
-    public void setStatusDetail(StatusDetailType newStatusDetail) {
+    public void setStatusDetail(final StatusDetailType newStatusDetail) {
         this.statusDetail = prepareForAssignment(this.statusDetail, newStatusDetail);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImplBuilder.java
index d223ef5..37d62b8 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/StatusTypeImplBuilder.java
@@ -33,7 +33,7 @@ public class StatusTypeImplBuilder extends AbstractXACMLObjectBuilder<StatusType
     }
 
     /** {@inheritDoc} */
-    public StatusType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 98aed15..00fe52c 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
@@ -34,7 +34,8 @@ public class StatusTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         StatusType status = (StatusType) parentObject;
 
         if (childObject instanceof StatusCodeType) {
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 ec51d1c..34fab17 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
@@ -43,7 +43,7 @@ public class SubjectTypeImpl extends AbstractXACMLObject implements SubjectType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
         subjectCategory = SUBJECT_CATEGORY_ATTTRIB_DEFAULT;
@@ -55,7 +55,7 @@ public class SubjectTypeImpl extends AbstractXACMLObject implements SubjectType
     }
 
     /** {@inheritDoc} */
-    public void setSubjectCategory(String newSubjectCategory) {
+    public void setSubjectCategory(final String newSubjectCategory) {
         subjectCategory = prepareForAssignment(this.subjectCategory, newSubjectCategory);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImplBuilder.java
index 4e096b3..c76b183 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/SubjectTypeImplBuilder.java
@@ -34,7 +34,7 @@ public class SubjectTypeImplBuilder extends AbstractXACMLObjectBuilder<SubjectTy
     }
 
     /** {@inheritDoc} */
-    public SubjectType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 85fd8ec..83131fe 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
@@ -32,7 +32,8 @@ public class SubjectTypeMarshaller extends AbstractXACMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         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 c565442..076e29c 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
@@ -33,7 +33,7 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         SubjectType attrib = (SubjectType) xmlObject;
         if (attribute.getLocalName().equals(SubjectType.SUBJECT_CATEGORY_ATTTRIB_NAME)) {
             attrib.setSubjectCategory(attribute.getValue());
@@ -43,7 +43,8 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         SubjectType subject = (SubjectType) parentObject;
         if (childObject instanceof AttributeType) {
             subject.getAttributes().add((AttributeType) childObject);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
index b9c3e5c..b6e8ad0 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
@@ -44,7 +44,7 @@ public abstract class BaseObligationHandler {
      * 
      * @param obligationId ID of the handled obligation
      */
-    protected BaseObligationHandler(String obligationId) {
+    protected BaseObligationHandler(final String obligationId) {
         this(obligationId, Integer.MIN_VALUE);
     }
 
@@ -54,7 +54,7 @@ public abstract class BaseObligationHandler {
      * @param obligationId ID of the handled obligation
      * @param handlerPrecedence precedence of this handler
      */
-    protected BaseObligationHandler(String obligationId, int handlerPrecedence) {
+    protected BaseObligationHandler(final String obligationId, final int handlerPrecedence) {
         id = StringSupport.trimOrNull(obligationId);
         if (id == null) {
             throw new IllegalArgumentException("Provided obligation ID may not be null or empty");
@@ -98,7 +98,7 @@ public abstract class BaseObligationHandler {
     }
 
     /** {@inheritDoc} */
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == this) {
             return true;
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingContext.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingContext.java
index c5ecb72..5b7d13e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingContext.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingContext.java
@@ -32,7 +32,7 @@ public class ObligationProcessingContext {
      * 
      * @param authzResult result of a XACML authorization request
      */
-    public ObligationProcessingContext(ResultType authzResult) {
+    public ObligationProcessingContext(final ResultType authzResult) {
         if (authzResult == null) {
             throw new IllegalArgumentException("Authorization request result may not be null");
         }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingException.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingException.java
index e9fdba8..82e01d3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingException.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/ObligationProcessingException.java
@@ -33,7 +33,7 @@ public class ObligationProcessingException extends Exception {
      * 
      * @param message exception message
      */
-    public ObligationProcessingException(String message) {
+    public ObligationProcessingException(final String message) {
         super(message);
     }
 
@@ -42,7 +42,7 @@ public class ObligationProcessingException extends Exception {
      * 
      * @param wrappedException exception to be wrapped by this one
      */
-    public ObligationProcessingException(Exception wrappedException) {
+    public ObligationProcessingException(final Exception wrappedException) {
         super(wrappedException);
     }
 
@@ -52,7 +52,7 @@ public class ObligationProcessingException extends Exception {
      * @param message exception message
      * @param wrappedException exception to be wrapped by this one
      */
-    public ObligationProcessingException(String message, Exception wrappedException) {
+    public ObligationProcessingException(final String message, final Exception wrappedException) {
         super(message, wrappedException);
     }
 }
\ No newline at end of file
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 0f85b24..626feec 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
@@ -64,7 +64,7 @@ public class ObligationService {
      * 
      * @param handler the handler to add to the list of registered handlers.
      */
-    public void addObligationhandler(BaseObligationHandler handler) {
+    public void addObligationhandler(final BaseObligationHandler handler) {
         if (handler == null) {
             return;
         }
@@ -85,7 +85,7 @@ public class ObligationService {
      * 
      * @param handlers the collection of handlers to add to the list of registered handlers.
      */
-    public void addObligationhandler(Collection<BaseObligationHandler> handlers) {
+    public void addObligationhandler(final Collection<BaseObligationHandler> handlers) {
         if (handlers == null || handlers.isEmpty()) {
             return;
         }
@@ -106,7 +106,7 @@ public class ObligationService {
      * 
      * @param handler the handler to remove from the list of registered handlers.
      */
-    public void removeObligationHandler(BaseObligationHandler handler) {
+    public void removeObligationHandler(final BaseObligationHandler handler) {
         if (handler == null) {
             return;
         }
@@ -129,7 +129,7 @@ public class ObligationService {
      * 
      * @throws ObligationProcessingException thrown if there is a problem evaluating an obligation
      */
-    public void processObligations(ObligationProcessingContext context) throws ObligationProcessingException {
+    public void processObligations(final ObligationProcessingContext context) throws ObligationProcessingException {
         Lock readLock = rwLock.readLock();
         readLock.lock();
         try {
@@ -157,7 +157,7 @@ public class ObligationService {
      * 
      * @return preprocessed obligations
      */
-    protected Map<String, ObligationType> preprocessObligations(ObligationProcessingContext context) {
+    protected Map<String, ObligationType> preprocessObligations(final ObligationProcessingContext context) {
         HashMap<String, ObligationType> effectiveObligations = new HashMap<>();
 
         ObligationsType obligations = context.getAuthorizationDecisionResult().getObligations();
@@ -185,7 +185,7 @@ public class ObligationService {
     private class ObligationHandlerComparator implements Comparator<BaseObligationHandler> {
 
         /** {@inheritDoc} */
-        public int compare(BaseObligationHandler o1, BaseObligationHandler o2) {
+        public int compare(final BaseObligationHandler o1, final BaseObligationHandler o2) {
             if (o1.getHandlerPrecedence() == o2.getHandlerPrecedence()) {
                 // If they have the same precedence sort lexigraphically
                 return o1.getObligationId().compareTo(o2.getObligationId());
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObject.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObject.java
index e36b930..190bf65 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObject.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObject.java
@@ -32,7 +32,8 @@ public abstract class AbstractXACMLObject extends AbstractXMLObject implements X
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AbstractXACMLObject(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AbstractXACMLObject(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectMarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectMarshaller.java
index 628edf1..f632b61 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectMarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectMarshaller.java
@@ -34,7 +34,7 @@ public abstract class AbstractXACMLObjectMarshaller extends AbstractXMLObjectMar
      * 
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
 
     }
 
@@ -44,7 +44,8 @@ public abstract class AbstractXACMLObjectMarshaller extends AbstractXMLObjectMar
      * 
      * {@inheritDoc}
      */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
 
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectUnmarshaller.java
index 80ee2d4..5131fa3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/impl/AbstractXACMLObjectUnmarshaller.java
@@ -31,19 +31,19 @@ public abstract class AbstractXACMLObjectUnmarshaller extends AbstractXMLObjectU
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
     }
 }
\ No newline at end of file
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 6ed872d..fe046fc 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
@@ -48,7 +48,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    public ActionMatchTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    public ActionMatchTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeChoice = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -86,7 +86,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
     }
 
     /** {@inheritDoc} */
-    public void setAttributeSelector(AttributeSelectorType selector) {
+    public void setAttributeSelector(final AttributeSelectorType selector) {
         AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
@@ -96,12 +96,12 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
     }
 
     /** {@inheritDoc} */
-    public void setAttributeValue(AttributeValueType value) {
+    public void setAttributeValue(final AttributeValueType value) {
         attributeValue = prepareForAssignment(attributeValue, value);
     }
 
     /** {@inheritDoc} */
-    public void setActionAttributeDesignator(AttributeDesignatorType attribute) {
+    public void setActionAttributeDesignator(final AttributeDesignatorType attribute) {
         AttributeDesignatorType currentDesignator = getActionAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
@@ -111,7 +111,7 @@ public class ActionMatchTypeImpl extends AbstractXACMLObject implements ActionMa
     }
 
     /** {@inheritDoc} */
-    public void setMatchId(String id) {
+    public void setMatchId(final String id) {
         matchId = prepareForAssignment(matchId, id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImplBuilder.java
index d36002a..2c5fbf8 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class ActionMatchTypeImplBuilder extends AbstractXACMLObjectBuilder<Actio
     }
 
     /** {@inheritDoc} */
-    public ActionMatchType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ActionMatchType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new ActionMatchTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 978fcb5..3768768 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
@@ -30,7 +30,7 @@ public class ActionMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ActionMatchType matchType = (ActionMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 d29df8d..a834c56 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
@@ -33,7 +33,7 @@ public class ActionMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(ActionMatchType.MATCH_ID_ATTRIB_NAME)) {
             ActionMatchType matchType = (ActionMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
@@ -44,7 +44,7 @@ public class ActionMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ActionMatchType matchType = (ActionMatchType) parentXMLObject;
       
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 4977621..ef14ad1 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
@@ -41,7 +41,7 @@ public class ActionTypeImpl extends AbstractXACMLObject implements ActionType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected ActionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
         actionMatch = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImplBuilder.java
index 9c1b7f6..70ab3bc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class ActionTypeImplBuilder extends AbstractXACMLObjectBuilder<ActionType
     }
     
     /** {@inheritDoc} */
-    public ActionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ActionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 }
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 adc8cf5..4bab823 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
@@ -30,7 +30,7 @@ public class ActionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ActionType actionType = (ActionType) parentXMLObject;
         
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 064f4b5..e17c7f6 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
@@ -41,7 +41,7 @@ public class ActionsTypeImpl extends AbstractXACMLObject implements ActionsType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionsTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected ActionsTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
         action = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImplBuilder.java
index 550a069..f9a8e50 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionsTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class ActionsTypeImplBuilder extends AbstractXACMLObjectBuilder<ActionsTy
     }
 
     /** {@inheritDoc} */
-    public ActionsType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ActionsType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionsTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 352ac31..417b194 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
@@ -30,7 +30,7 @@ public class ActionsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ActionsType actionType = (ActionsType) parentXMLObject;
         
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 9665993..265a539 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
@@ -45,7 +45,7 @@ public class ApplyTypeImpl extends AbstractXACMLObject implements ApplyType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ApplyTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ApplyTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);     
         expressions = new XMLObjectChildrenList<>(this);
     }
@@ -61,7 +61,7 @@ public class ApplyTypeImpl extends AbstractXACMLObject implements ApplyType {
     }
 
     /** {@inheritDoc} */
-    public void setFunctionId(String id) {
+    public void setFunctionId(final String id) {
         this.functionId = prepareForAssignment(this.functionId,id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImplBuilder.java
index 5e7c1f7..d16f128 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeImplBuilder.java
@@ -26,7 +26,7 @@ import org.opensaml.xacml.policy.ApplyType;
 public class ApplyTypeImplBuilder extends AbstractXACMLObjectBuilder<ApplyType> {
 
     /** {@inheritDoc} */
-    public ApplyType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ApplyType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
        return new ApplyTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 1fd9ee7..67466cc 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
@@ -32,7 +32,7 @@ public class ApplyTypeMarshaller extends AbstractXACMLObjectMarshaller {
         
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ApplyType applyType = (ApplyType)xmlObject;
         
         if(!Strings.isNullOrEmpty(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 fac8b47..a3f12a7 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
@@ -33,7 +33,7 @@ public class ApplyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
         if (attribute.getLocalName().equals(ApplyType.FUNCTION_ID_ATTRIB_NAME)) {
             ApplyType applyType = (ApplyType) xmlObject;
@@ -46,7 +46,7 @@ public class ApplyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ApplyType applayType = (ApplyType) parentXMLObject;
         if (childXMLObject instanceof ExpressionType) {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java
index acf532d..7f4fd36 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java
@@ -32,7 +32,8 @@ public class AttributeAssignmentTypeImpl extends AttributeValueTypeImpl implemen
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeAssignmentTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeAssignmentTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -42,7 +43,7 @@ public class AttributeAssignmentTypeImpl extends AttributeValueTypeImpl implemen
     }
 
     /** {@inheritDoc} */
-    public void setAttributeId(String newAttributeID) {
+    public void setAttributeId(final String newAttributeID) {
         attributeId = prepareForAssignment(this.attributeId, newAttributeID);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImplBuilder.java
index 5aada40..e0a9e85 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class AttributeAssignmentTypeImplBuilder extends AbstractXACMLObjectBuild
     }
 
     /** {@inheritDoc} */
-    public AttributeAssignmentType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeAssignmentType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new AttributeAssignmentTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 0abebbf..b70e037 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
@@ -29,7 +29,8 @@ public class AttributeAssignmentTypeMarshaller extends AttributeValueTypeMarshal
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         AttributeAssignmentType attributeAssignment = (AttributeAssignmentType) samlElement;
 
         if (!Strings.isNullOrEmpty(attributeAssignment.getAttributeId())) {
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 7a2b6c5..b511f0d 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
@@ -29,7 +29,7 @@ public class AttributeAssignmentTypeUnmarshaller extends AttributeValueTypeUnmar
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         AttributeAssignmentType attrib = (AttributeAssignmentType) samlObject;
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImpl.java
index 141766e..8bd7f9d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImpl.java
@@ -53,7 +53,8 @@ public class AttributeDesignatorTypeImpl extends AbstractXACMLObject implements
      * @param namespacePrefix
      *                the prefix for the given namespace
      */
-    protected AttributeDesignatorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeDesignatorTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         mustBePresentXS = XSBooleanValue.valueOf("false");
     }
@@ -87,28 +88,28 @@ public class AttributeDesignatorTypeImpl extends AbstractXACMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setAttributeId(String id) {
+    public void setAttributeId(final String id) {
         this.attributeId = prepareForAssignment(this.attributeId, id);
     }
 
     /** {@inheritDoc} */
-    public void setDataType(String type) {
+    public void setDataType(final String type) {
         this.dataType = prepareForAssignment(this.dataType, type);
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(String newIssuer) {
+    public void setIssuer(final String newIssuer) {
         this.issuer = prepareForAssignment(this.issuer, newIssuer);
     }
 
     /** {@inheritDoc} */
-    public void setMustBePresentXSBoolean(XSBooleanValue present) {
+    public void setMustBePresentXSBoolean(final XSBooleanValue present) {
         this.mustBePresentXS = prepareForAssignment(this.mustBePresentXS,
                 present);
     }
 
     /** {@inheritDoc} */
-    public void setMustBePresent(Boolean present) {
+    public void setMustBePresent(final Boolean present) {
         if (present != null) {
             mustBePresentXS = prepareForAssignment(mustBePresentXS, new XSBooleanValue(present, false));
         } else {
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImplBuilder.java
index 7ba23ec..f99642e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.AttributeDesignatorType;
 public class AttributeDesignatorTypeImplBuilder extends AbstractXACMLObjectBuilder<AttributeDesignatorType> {
 
     /** {@inheritDoc} */
-    public AttributeDesignatorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeDesignatorType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
        return new AttributeDesignatorTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 0ff7189..74c35c6 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
@@ -32,7 +32,7 @@ public class AttributeDesignatorTypeMarshaller extends AbstractXACMLObjectMarsha
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement)  throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
 
         if (!Strings.isNullOrEmpty(attributeDesignatorType.getAttributeId())) {
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 b65ee10..ece000a 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
@@ -33,7 +33,7 @@ public class AttributeDesignatorTypeUnmarshaller extends AbstractXACMLObjectUnma
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         AttributeDesignatorType attributeDesignatorType = (AttributeDesignatorType) xmlObject;
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImpl.java
index 09a2e14..ba26435 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImpl.java
@@ -50,7 +50,8 @@ public class AttributeSelectorTypeImpl extends AbstractXACMLObject implements At
      * @param namespacePrefix
      *                the prefix for the given namespace
      */
-    protected AttributeSelectorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeSelectorTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         mustBePresentXS = XSBooleanValue.valueOf("false");
     }
@@ -79,17 +80,17 @@ public class AttributeSelectorTypeImpl extends AbstractXACMLObject implements At
     }
 
     /** {@inheritDoc} */
-    public void setDataType(String type) {
+    public void setDataType(final String type) {
         dataType = prepareForAssignment(dataType, type);
     }
 
     /** {@inheritDoc} */
-    public void setMustBePresentXSBoolean(XSBooleanValue present) {
+    public void setMustBePresentXSBoolean(final XSBooleanValue present) {
         mustBePresentXS = prepareForAssignment(mustBePresentXS, present);
     }
 
     /** {@inheritDoc} */
-    public void setMustBePresent(Boolean present) {
+    public void setMustBePresent(final Boolean present) {
         if (present != null) {
             mustBePresentXS = prepareForAssignment(mustBePresentXS, new XSBooleanValue(present, false));
         } else {
@@ -98,7 +99,7 @@ public class AttributeSelectorTypeImpl extends AbstractXACMLObject implements At
     }
 
     /** {@inheritDoc} */
-    public void setRequestContextPath(String path) {
+    public void setRequestContextPath(final String path) {
         requestContextPath = prepareForAssignment(this.requestContextPath, path);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImplBuilder.java
index e6b2cc4..a9b9b56 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.AttributeSelectorType;
 public class AttributeSelectorTypeImplBuilder extends AbstractXACMLObjectBuilder<AttributeSelectorType>  {
 
     /** {@inheritDoc} */
-    public AttributeSelectorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeSelectorType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new AttributeSelectorTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 386c224..993f12f 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
@@ -33,7 +33,7 @@ public class AttributeSelectorTypeMarshaller extends AbstractXACMLObjectMarshall
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
         
         if(!Strings.isNullOrEmpty(attributeSelectorType.getDataType())){
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 a35fbac..42e9d3b 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
@@ -33,7 +33,7 @@ public class AttributeSelectorTypeUnmarshaller extends AbstractXACMLObjectUnmars
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AttributeSelectorType attributeSelectorType = (AttributeSelectorType) xmlObject;
         
         if (attribute.getLocalName().equals(AttributeSelectorType.REQUEST_CONTEXT_PATH_ATTRIB_NAME)){
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 e0b33d8..73fa16f 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
@@ -51,7 +51,8 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeValueTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeValueTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         unknownElements = new IndexedXMLObjectChildrenList<>(this);
@@ -63,7 +64,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public void setDataType(String type) {
+    public void setDataType(final String type) {
         dataType = prepareForAssignment(this.dataType, type);
     }
 
@@ -87,7 +88,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownElements.subList(typeOrName);
     }
 
@@ -97,7 +98,7 @@ public class AttributeValueTypeImpl extends AbstractXACMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public void setValue(String value) {
+    public void setValue(final String value) {
         textContent = prepareForAssignment(textContent, value);
     }
 }
\ No newline at end of file
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImplBuilder.java
index 52611af..1dc69c6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeImplBuilder.java
@@ -24,7 +24,8 @@ import org.opensaml.xacml.policy.AttributeValueType;
 public class AttributeValueTypeImplBuilder extends AbstractXACMLObjectBuilder<AttributeValueType> {
 
     /** {@inheritDoc} */
-    public AttributeValueType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeValueType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new AttributeValueTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 79e832a..62a9d1a 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
@@ -33,7 +33,7 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if(!Strings.isNullOrEmpty(attributeValue.getDataType())){
@@ -45,7 +45,8 @@ public class AttributeValueTypeMarshaller extends AbstractXACMLObjectMarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
+            throws MarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         if (attributeValue.getValue() != null) {
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 94148d5..6f73812 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
@@ -33,7 +33,7 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
 
         QName attribQName = QNameSupport.getNodeQName(attribute);
@@ -51,7 +51,7 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         AttributeValueType attributeValue = (AttributeValueType) parentXMLObject;
         attributeValue.getUnknownXMLObjects().add(childXMLObject);
@@ -59,7 +59,7 @@ public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshal
 
     /** {@inheritDoc} */
     @Override
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         AttributeValueType attributeValue = (AttributeValueType) xmlObject;
         attributeValue.setValue(elementContent);
     }
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 e56d9d6..1db989d 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
@@ -43,7 +43,8 @@ public class CombinerParameterTypeImpl extends AbstractXACMLObject implements Co
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected CombinerParameterTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected CombinerParameterTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
     }
     
@@ -58,12 +59,12 @@ public class CombinerParameterTypeImpl extends AbstractXACMLObject implements Co
     }
 
     /** {@inheritDoc} */
-    public void setAttributeValue(AttributeValueType newValue) {
+    public void setAttributeValue(final AttributeValueType newValue) {
         this.value = prepareForAssignment(this.value,newValue);
     }
 
     /** {@inheritDoc} */
-    public void setParameterName(String newName){
+    public void setParameterName(final String newName){
         this.name = prepareForAssignment(this.name,newName);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImplBuilder.java
index 264607f..91f4c86 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeImplBuilder.java
@@ -31,7 +31,8 @@ public class CombinerParameterTypeImplBuilder extends AbstractXACMLObjectBuilder
     }
     
     /** {@inheritDoc} */
-    public CombinerParameterType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CombinerParameterType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new CombinerParameterTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 }
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 f1497f9..3f55ba7 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
@@ -32,7 +32,7 @@ public class CombinerParameterTypeMarshaller extends AbstractXACMLObjectMarshall
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
 
         if (!Strings.isNullOrEmpty(combinerParameterType.getParameterName())) {
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 9f12e26..1252cef 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
@@ -33,7 +33,7 @@ public class CombinerParameterTypeUnmarshaller extends AbstractXACMLObjectUnmars
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         CombinerParameterType combinerParameterType = (CombinerParameterType) xmlObject;
       
         if(attribute.getLocalName().equals(CombinerParameterType.PARAMETER_NAMEATTRIB_NAME)){
@@ -45,7 +45,7 @@ public class CombinerParameterTypeUnmarshaller extends AbstractXACMLObjectUnmars
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         CombinerParameterType combinerParameterType = (CombinerParameterType) parentXMLObject;
         
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 d666f74..38838c5 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
@@ -41,7 +41,8 @@ public class CombinerParametersTypeImpl extends AbstractXACMLObject implements C
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected CombinerParametersTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected CombinerParametersTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
         combinerParameters = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImplBuilder.java
index d65fe50..9d7247d 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeImplBuilder.java
@@ -31,7 +31,8 @@ public class CombinerParametersTypeImplBuilder extends AbstractXACMLObjectBuilde
     }
     
     /** {@inheritDoc} */
-    public CombinerParametersType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public CombinerParametersType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new CombinerParametersTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 1e33c6c..5e28d0d 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
@@ -30,7 +30,7 @@ public class CombinerParametersTypeUnmarshaller extends AbstractXACMLObjectUnmar
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         CombinerParametersType combinerParametersType = (CombinerParametersType) parentXMLObject;
         
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 0854eb5..c31ce43 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
@@ -40,7 +40,7 @@ public class ConditionTypeImpl extends AbstractXACMLObject implements ConditionT
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ConditionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected ConditionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);    
     }
   
@@ -50,7 +50,7 @@ public class ConditionTypeImpl extends AbstractXACMLObject implements ConditionT
     }
     
     /** {@inheritDoc} */
-    public void setExpression(ExpressionType exp){
+    public void setExpression(final ExpressionType exp){
         expression = prepareForAssignment(expression, exp);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImplBuilder.java
index 3f4cf24..21fb9ec 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ConditionTypeImplBuilder.java
@@ -26,7 +26,7 @@ import org.opensaml.xacml.policy.ConditionType;
 public class ConditionTypeImplBuilder extends AbstractXACMLObjectBuilder<ConditionType> {
 
     /** {@inheritDoc} */
-    public ConditionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ConditionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ConditionTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 b704924..ce33569 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
@@ -30,7 +30,7 @@ public class ConditionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         if(childXMLObject instanceof ExpressionType){
             ConditionType conditionType = (ConditionType)parentXMLObject;
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 fd39ee7..c4306e9 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
@@ -39,7 +39,7 @@ public class DefaultsTypeImpl extends AbstractXACMLObject implements DefaultsTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DefaultsTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DefaultsTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -49,7 +49,7 @@ public class DefaultsTypeImpl extends AbstractXACMLObject implements DefaultsTyp
     }
 
     /** {@inheritDoc} */
-    public void setXPathVersion(XSString version) {
+    public void setXPathVersion(final XSString version) {
         this.xPathVersion = prepareForAssignment(this.xPathVersion, version);
 
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImplBuilder.java
index 1b2e567..2928a42 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DefaultsTypeImplBuilder.java
@@ -24,7 +24,7 @@ import org.opensaml.xacml.policy.DefaultsType;
 public class DefaultsTypeImplBuilder extends AbstractXACMLObjectBuilder<DefaultsType> {
 
     /** {@inheritDoc} */
-    public DefaultsType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DefaultsType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DefaultsTypeImpl(namespaceURI, localName, namespacePrefix);
 
     }
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 8a3ee62..3d3965f 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
@@ -28,7 +28,7 @@ public class DefaultsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         if (childXMLObject instanceof XSString) {
             DefaultsType defaultType = (DefaultsType) parentXMLObject;
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImpl.java
index 751204d..66928bc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImpl.java
@@ -40,7 +40,8 @@ public class DescriptionTypeImpl extends AbstractXACMLObject implements Descript
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DescriptionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DescriptionTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -50,7 +51,7 @@ public class DescriptionTypeImpl extends AbstractXACMLObject implements Descript
     }
 
     /** {@inheritDoc} */
-    public void setValue(String arg0) {
+    public void setValue(final String arg0) {
         description = prepareForAssignment(this.description, arg0);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImplBuilder.java
index 9b1491f..f571e31 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/DescriptionTypeImplBuilder.java
@@ -40,7 +40,8 @@ public class DescriptionTypeImplBuilder extends AbstractXACMLObjectBuilder<Descr
     }
 
     /** {@inheritDoc} */
-    public DescriptionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DescriptionType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new DescriptionTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 1cfaf88..eda92b8 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
@@ -32,7 +32,8 @@ public class DescriptionTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallElementContent(XMLObject xmlobject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlobject, final Element domElement)
+            throws MarshallingException {
         DescriptionType message = (DescriptionType) xmlobject;
 
         if (message.getValue() != null) {
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 4e87dc5..dd81e5a 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
@@ -28,7 +28,7 @@ public class DescriptionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         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 43c1ef9..4bbbbb9 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
@@ -48,7 +48,8 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    public EnvironmentMatchTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    public EnvironmentMatchTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeChoice = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -86,7 +87,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
     }
 
     /** {@inheritDoc} */
-    public void setAttributeSelector(AttributeSelectorType selector) {
+    public void setAttributeSelector(final AttributeSelectorType selector) {
         AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
@@ -96,12 +97,12 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
     }
 
     /** {@inheritDoc} */
-    public void setAttributeValue(AttributeValueType value) {
+    public void setAttributeValue(final AttributeValueType value) {
         attributeValue = prepareForAssignment(attributeValue, value);
     }
 
     /** {@inheritDoc} */
-    public void setEnvironmentAttributeDesignator(AttributeDesignatorType attribute) {
+    public void setEnvironmentAttributeDesignator(final AttributeDesignatorType attribute) {
         AttributeDesignatorType currentDesignator = getEnvironmentAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
@@ -111,7 +112,7 @@ public class EnvironmentMatchTypeImpl extends AbstractXACMLObject implements Env
     }
 
     /** {@inheritDoc} */
-    public void setMatchId(String id) {
+    public void setMatchId(final String id) {
         matchId = prepareForAssignment(matchId, id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImplBuilder.java
index 8cd4be2..7ed1c9a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class EnvironmentMatchTypeImplBuilder extends AbstractXACMLObjectBuilder<
     }
 
     /** {@inheritDoc} */
-    public EnvironmentMatchType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EnvironmentMatchType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EnvironmentMatchTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 8ccc347..8125956 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
@@ -30,7 +30,7 @@ public class EnvironmentMatchTypeMarshaller extends AbstractXACMLObjectMarshalle
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 ad36a20..bd02000 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
@@ -33,7 +33,7 @@ public class EnvironmentMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarsh
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(EnvironmentMatchType.MATCH_ID_ATTRIB_NAME)) {
             EnvironmentMatchType matchType = (EnvironmentMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
@@ -44,7 +44,7 @@ public class EnvironmentMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarsh
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EnvironmentMatchType matchType = (EnvironmentMatchType) parentXMLObject;
         if (childXMLObject instanceof AttributeValueType) {
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 780bf00..6ee7315 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
@@ -43,7 +43,8 @@ public class EnvironmentTypeImpl extends AbstractXACMLObject implements Environm
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EnvironmentTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected EnvironmentTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
         environmentMatches = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImplBuilder.java
index ffe44cb..d49191a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentTypeImplBuilder.java
@@ -32,7 +32,8 @@ public class EnvironmentTypeImplBuilder extends AbstractXACMLObjectBuilder<Envir
     }
 
     /** {@inheritDoc} */
-    public EnvironmentType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EnvironmentType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EnvironmentTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 76ff259..0d0b42c 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
@@ -30,7 +30,7 @@ public class EnvironmentTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EnvironmentType environmentType = (EnvironmentType) parentXMLObject;
         
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 acb117f..6765064 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
@@ -42,7 +42,8 @@ public class EnvironmentsTypeImpl extends AbstractXACMLObject implements Environ
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EnvironmentsTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected EnvironmentsTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
         environments = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImplBuilder.java
index 3b51108..dde02cf 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentsTypeImplBuilder.java
@@ -30,7 +30,8 @@ public class EnvironmentsTypeImplBuilder extends AbstractXACMLObjectBuilder<Envi
     }
 
     /** {@inheritDoc} */
-    public EnvironmentsType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EnvironmentsType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new EnvironmentsTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
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 6a72c59..85e6941 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
@@ -30,7 +30,7 @@ public class EnvironmentsTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
     
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         EnvironmentsType environmentsType = (EnvironmentsType) parentXMLObject;
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImpl.java
index 9611f30..c0ee99f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImpl.java
@@ -37,7 +37,7 @@ public class FunctionTypeImpl extends AbstractXACMLObject implements FunctionTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected FunctionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected FunctionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
     }
     
@@ -47,7 +47,7 @@ public class FunctionTypeImpl extends AbstractXACMLObject implements FunctionTyp
     }
 
     /** {@inheritDoc} */
-    public void setFunctionId(String id) {
+    public void setFunctionId(final String id) {
         functionId = prepareForAssignment(this.functionId,id);
 
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImplBuilder.java
index 141d65f..e18503e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeImplBuilder.java
@@ -26,7 +26,7 @@ import org.opensaml.xacml.policy.FunctionType;
 public class FunctionTypeImplBuilder extends AbstractXACMLObjectBuilder<FunctionType>  {
 
     /** {@inheritDoc} */
-    public FunctionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public FunctionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new FunctionTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 af072fb..2e27dc2 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
@@ -32,7 +32,7 @@ public class FunctionTypeMarshaller extends AbstractXACMLObjectMarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         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 ca0f4f4..73a6b67 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
@@ -32,7 +32,7 @@ public class FunctionTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(FunctionType.FUNCTION_ID_ATTRIB_NAME)){
             FunctionType functionType = (FunctionType) xmlObject;
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImpl.java
index 8c6d0f5..a17a5e4 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImpl.java
@@ -41,7 +41,8 @@ public class IdReferenceTypeImpl extends XSStringImpl implements IdReferenceType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IdReferenceTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IdReferenceTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -62,17 +63,17 @@ public class IdReferenceTypeImpl extends XSStringImpl implements IdReferenceType
     }
 
     /** {@inheritDoc} */
-    public void setEarliestVersion(String newEarliestVersion) {
+    public void setEarliestVersion(final String newEarliestVersion) {
         this.earliestVersion = prepareForAssignment(this.earliestVersion,newEarliestVersion);
     }
 
     /** {@inheritDoc} */
-    public void setLatestVersion(String newLastestVersion) {
+    public void setLatestVersion(final String newLastestVersion) {
         this.latestVersion = prepareForAssignment(this.latestVersion,newLastestVersion);
     }
 
     /** {@inheritDoc} */
-    public void setVersion(String newVersion) {
+    public void setVersion(final String newVersion) {
        this.version = prepareForAssignment(this.version,newVersion);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImplBuilder.java
index a2af846..8ca9ba2 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeImplBuilder.java
@@ -31,7 +31,8 @@ public class IdReferenceTypeImplBuilder extends AbstractXACMLObjectBuilder<IdRef
     }
 
     /** {@inheritDoc} */
-    public IdReferenceType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public IdReferenceType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new IdReferenceTypeImpl(namespaceURI, localName,namespacePrefix);
     }
 }
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 87053e6..3aecb02 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
@@ -32,7 +32,7 @@ public class IdReferenceTypeMarshaller extends XSStringMarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
         
         if(!Strings.isNullOrEmpty(idReferenceType.getEarliestVersion())){
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 1c73665..bddd9bd 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
@@ -32,7 +32,7 @@ public class IdReferenceTypeUnmarshaller extends XSStringUnmarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         IdReferenceType idReferenceType = (IdReferenceType)xmlObject;
      
         if(attribute.getLocalName().equals(IdReferenceType.EARLIEST_VERSION_ATTRIB_NAME)){           
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 155056b..001d8b9 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
@@ -47,7 +47,8 @@ public class ObligationTypeImpl extends AbstractXACMLObject implements Obligatio
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ObligationTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ObligationTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeAssignments = new XMLObjectChildrenList<>(this);
     }
@@ -68,12 +69,12 @@ public class ObligationTypeImpl extends AbstractXACMLObject implements Obligatio
     }
 
     /** {@inheritDoc} */
-    public void setFulfillOn(EffectType newFulfillOn) {
+    public void setFulfillOn(final EffectType newFulfillOn) {
         fulFillOn = prepareForAssignment(this.fulFillOn, newFulfillOn);
     }
 
     /** {@inheritDoc} */
-    public void setObligationId(String newObligationId) {
+    public void setObligationId(final String newObligationId) {
         obligationId = prepareForAssignment(this.obligationId, newObligationId);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImplBuilder.java
index 8458a4c..6ee54c2 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationTypeImplBuilder.java
@@ -29,7 +29,7 @@ public class ObligationTypeImplBuilder extends AbstractXACMLObjectBuilder<Obliga
     }
 
     /** {@inheritDoc} */
-    public ObligationType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ObligationType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ObligationTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 1edfe75..f1d590d 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
@@ -31,7 +31,8 @@ public class ObligationTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement)
+            throws MarshallingException {
         ObligationType obligation = (ObligationType) samlElement;
 
         if (!Strings.isNullOrEmpty(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 6863695..3276800 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
@@ -30,7 +30,8 @@ public class ObligationTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
         ObligationType obligation = (ObligationType) parentObject;
 
         if (childObject instanceof AttributeAssignmentType) {
@@ -42,7 +43,7 @@ public class ObligationTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
 
         ObligationType obligation = (ObligationType) xmlObject;
 
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 720dfed..1c5487b 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
@@ -40,7 +40,8 @@ public class ObligationsTypeImpl extends AbstractXACMLObject implements Obligati
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ObligationsTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ObligationsTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         obligations = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImplBuilder.java
index 6799a60..877351e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ObligationsTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class ObligationsTypeImplBuilder extends AbstractXACMLObjectBuilder<Oblig
     }
 
     /** {@inheritDoc} */
-    public ObligationsType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ObligationsType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new ObligationsTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
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 37503c5..98d1a8d 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
@@ -28,7 +28,8 @@ public class ObligationsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject)
+            throws UnmarshallingException {
 
         ObligationsType obligations = (ObligationsType) parentObject;
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java
index 05d1586..bd8e39b 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java
@@ -33,7 +33,8 @@ public class PolicyCombinerParametersTypeImpl extends CombinerParametersTypeImpl
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PolicyCombinerParametersTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PolicyCombinerParametersTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         // combinerParameters = new XMLObjectChildrenList<CombinerParameterType>(this);
     }
@@ -44,7 +45,7 @@ public class PolicyCombinerParametersTypeImpl extends CombinerParametersTypeImpl
     }
 
     /** {@inheritDoc} */
-    public void setPolicyIdRef(String ref) {
+    public void setPolicyIdRef(final String ref) {
         this.policyIdRef = prepareForAssignment(this.policyIdRef, ref);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImplBuilder.java
index 5fbb758..c0a801c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.PolicyCombinerParametersType;
 public class PolicyCombinerParametersTypeImplBuilder extends AbstractXACMLObjectBuilder<PolicyCombinerParametersType> {
 
     /** {@inheritDoc} */
-    public PolicyCombinerParametersType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PolicyCombinerParametersType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new PolicyCombinerParametersTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 66d38d9..d0e666a 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
@@ -31,7 +31,7 @@ public class PolicyCombinerParametersTypeMarshaller extends CombinerParametersTy
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         PolicyCombinerParametersType policyCombinerParametersType = (PolicyCombinerParametersType)xmlObject;
         
         if(!Strings.isNullOrEmpty(policyCombinerParametersType.getPolicyIdRef())){
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 eee1813..30de2f8 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
@@ -31,7 +31,7 @@ public class PolicyCombinerParametersTypeUnmarshaller extends CombinerParameters
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    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;
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImpl.java
index bf5a7f5..8422cb2 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImpl.java
@@ -28,7 +28,7 @@ import org.opensaml.xacml.policy.PolicySetCombinerParametersType;
 public class PolicySetCombinerParametersTypeImpl extends CombinerParametersTypeImpl implements
         PolicySetCombinerParametersType {
 
-    /**Policy indentity reference.*/
+    /**Policy identity reference.*/
     private String policySetIdRef;
     
     /**
@@ -37,7 +37,8 @@ public class PolicySetCombinerParametersTypeImpl extends CombinerParametersTypeI
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PolicySetCombinerParametersTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected PolicySetCombinerParametersTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);        
     }
     
@@ -47,7 +48,7 @@ public class PolicySetCombinerParametersTypeImpl extends CombinerParametersTypeI
     }
 
     /** {@inheritDoc} */
-    public void setPolicySetIdRef(String ref) {
+    public void setPolicySetIdRef(final String ref) {
         this.policySetIdRef = prepareForAssignment(this.policySetIdRef,ref);
 
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImplBuilder.java
index e22c83b..e26d3e7 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeImplBuilder.java
@@ -27,7 +27,8 @@ public class PolicySetCombinerParametersTypeImplBuilder
         extends AbstractXACMLObjectBuilder<PolicySetCombinerParametersType> {
 
     /** {@inheritDoc} */
-    public PolicySetCombinerParametersType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PolicySetCombinerParametersType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new PolicySetCombinerParametersTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 24f3993..0244f8f 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
@@ -31,7 +31,7 @@ public class PolicySetCombinerParametersTypeMarshaller extends CombinerParameter
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         PolicySetCombinerParametersType policySetCombinerParametersType = (PolicySetCombinerParametersType)xmlObject;
         
         if(!Strings.isNullOrEmpty(policySetCombinerParametersType.getPolicySetIdRef())){
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 d538183..5cb804a 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
@@ -31,7 +31,7 @@ public class PolicySetCombinerParametersTypeUnmarshaller extends CombinerParamet
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if(attribute.getLocalName().equals(PolicySetCombinerParametersType.POLICY_SET_ID_REF_ATTRIB_NAME)){
             PolicySetCombinerParametersType policySetCombinerParametersType = 
                 (PolicySetCombinerParametersType)xmlObject;
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 bff478a..7b9e3e8 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
@@ -59,7 +59,7 @@ public class PolicySetTypeImpl extends AbstractXACMLObject implements PolicySetT
     /** Version of this policy set. */
     private String version;
 
-    /** Policy combinging algorithm ID. */
+    /** Policy combining algorithm ID. */
     private String combiningAlgo;
 
     /**
@@ -69,7 +69,8 @@ public class PolicySetTypeImpl extends AbstractXACMLObject implements PolicySetT
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PolicySetTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PolicySetTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         choiceGroup = new IndexedXMLObjectChildrenList<>(this);
         version = DEFAULT_VERSION;
@@ -172,37 +173,37 @@ public class PolicySetTypeImpl extends AbstractXACMLObject implements PolicySetT
     }
 
     /** {@inheritDoc} */
-    public void setDescription(DescriptionType newDescription) {
+    public void setDescription(final DescriptionType newDescription) {
         this.description = prepareForAssignment(this.description, newDescription);
     }
 
     /** {@inheritDoc} */
-    public void setObligations(ObligationsType newObligations) {
+    public void setObligations(final ObligationsType newObligations) {
         this.obligations = prepareForAssignment(this.obligations, newObligations);
     }
 
     /** {@inheritDoc} */
-    public void setPolicyCombiningAlgoId(String id) {
+    public void setPolicyCombiningAlgoId(final String id) {
         combiningAlgo = prepareForAssignment(combiningAlgo, id);
     }
 
     /** {@inheritDoc} */
-    public void setPolicySetDefaults(DefaultsType defaults) {
+    public void setPolicySetDefaults(final DefaultsType defaults) {
         policySetDefaults = prepareForAssignment(policySetDefaults, defaults);
     }
 
     /** {@inheritDoc} */
-    public void setPolicySetId(String id) {
+    public void setPolicySetId(final String id) {
         policySetId = prepareForAssignment(policySetId, id);
     }
 
     /** {@inheritDoc} */
-    public void setTarget(TargetType newTarget) {
+    public void setTarget(final TargetType newTarget) {
         this.target = prepareForAssignment(this.target, newTarget);
     }
 
     /** {@inheritDoc} */
-    public void setVersion(String newVersion) {
+    public void setVersion(final String newVersion) {
         this.version = prepareForAssignment(this.version, newVersion);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImplBuilder.java
index 7ce43c8..61af4fc 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetTypeImplBuilder.java
@@ -29,7 +29,7 @@ public class PolicySetTypeImplBuilder extends AbstractXACMLObjectBuilder<PolicyS
     }
 
     /** {@inheritDoc} */
-    public PolicySetType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PolicySetType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PolicySetTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 739382d..41b13de 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
@@ -30,7 +30,7 @@ public class PolicySetTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         PolicySetType policySet = (PolicySetType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 0686c90..364a56f 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
@@ -37,7 +37,7 @@ public class PolicySetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         PolicySetType policySet = (PolicySetType) xmlObject;
 
         if (attribute.getLocalName().equals(PolicySetType.POLICY_SET_ID_ATTRIB_NAME)) {
@@ -54,7 +54,7 @@ public class PolicySetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 // Checkstyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         PolicySetType policySet = (PolicySetType) parentXMLObject;
 
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 e27f433..b17fc87 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
@@ -68,7 +68,7 @@ public class PolicyTypeImpl extends AbstractXACMLObject implements PolicyType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PolicyTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PolicyTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         choiceGroup = new IndexedXMLObjectChildrenList<>(this);
         version = VERSION_DEFAULT_VALUE;
@@ -130,37 +130,37 @@ public class PolicyTypeImpl extends AbstractXACMLObject implements PolicyType {
     }
 
     /** {@inheritDoc} */
-    public void setDescription(DescriptionType newDescription) {
+    public void setDescription(final DescriptionType newDescription) {
         this.description = prepareForAssignment(this.description, newDescription);
     }
 
     /** {@inheritDoc} */
-    public void setObligations(ObligationsType newObligations) {
+    public void setObligations(final ObligationsType newObligations) {
         this.obligations = prepareForAssignment(this.obligations, newObligations);
     }
 
     /** {@inheritDoc} */
-    public void setPolicyDefaults(DefaultsType defaults) {
+    public void setPolicyDefaults(final DefaultsType defaults) {
         policyDefaults = prepareForAssignment(policyDefaults, defaults);
     }
 
     /** {@inheritDoc} */
-    public void setPolicyId(String id) {
+    public void setPolicyId(final String id) {
         policyId = prepareForAssignment(policyId, id);
     }
 
     /** {@inheritDoc} */
-    public void setRuleCombiningAlgoId(String id) {
+    public void setRuleCombiningAlgoId(final String id) {
         ruleCombiningAlgo = prepareForAssignment(ruleCombiningAlgo, id);
     }
 
     /** {@inheritDoc} */
-    public void setTarget(TargetType newTarget) {
+    public void setTarget(final TargetType newTarget) {
         this.target = prepareForAssignment(this.target, newTarget);
     }
 
     /** {@inheritDoc} */
-    public void setVersion(String newVersion) {
+    public void setVersion(final String newVersion) {
         this.version = prepareForAssignment(this.version, newVersion);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImplBuilder.java
index cb2fcd0..ea862aa 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyTypeImplBuilder.java
@@ -29,7 +29,7 @@ public class PolicyTypeImplBuilder extends AbstractXACMLObjectBuilder<PolicyType
     }
 
     /** {@inheritDoc} */
-    public PolicyType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PolicyType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PolicyTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 337843e..f7ae83f 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
@@ -30,7 +30,7 @@ public class PolicyTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         PolicyType policy = (PolicyType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 7a3ff10..5df2235 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
@@ -36,7 +36,7 @@ public class PolicyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         PolicyType policy = (PolicyType) xmlObject;
 
         if (attribute.getLocalName().equals(PolicyType.POLICY_ID_ATTRIB_NAME)) {
@@ -52,7 +52,7 @@ public class PolicyTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         PolicyType policy = (PolicyType) parentXMLObject;
 
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 d4c4e52..726e444 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
@@ -48,7 +48,8 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    public ResourceMatchTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    public ResourceMatchTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeChoice = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -86,7 +87,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
     }
 
     /** {@inheritDoc} */
-    public void setAttributeSelector(AttributeSelectorType selector) {
+    public void setAttributeSelector(final AttributeSelectorType selector) {
         AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
@@ -96,12 +97,12 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
     }
 
     /** {@inheritDoc} */
-    public void setAttributeValue(AttributeValueType value) {
+    public void setAttributeValue(final AttributeValueType value) {
         attributeValue = prepareForAssignment(attributeValue, value);
     }
 
     /** {@inheritDoc} */
-    public void setResourceAttributeDesignator(AttributeDesignatorType attribute) {
+    public void setResourceAttributeDesignator(final AttributeDesignatorType attribute) {
         AttributeDesignatorType currentDesignator = getResourceAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
@@ -111,7 +112,7 @@ public class ResourceMatchTypeImpl extends AbstractXACMLObject implements Resour
     }
 
     /** {@inheritDoc} */
-    public void setMatchId(String id) {
+    public void setMatchId(final String id) {
         matchId = prepareForAssignment(matchId, id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImplBuilder.java
index c3bf304..3966fc2 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class ResourceMatchTypeImplBuilder extends AbstractXACMLObjectBuilder<Res
     }
 
     /** {@inheritDoc} */
-    public ResourceMatchType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResourceMatchType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new ResourceMatchTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 3f19a62..ed9e2c4 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
@@ -30,7 +30,7 @@ public class ResourceMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ResourceMatchType matchType = (ResourceMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 fdc1a6e..750d899 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
@@ -33,7 +33,7 @@ public class ResourceMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshall
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(ResourceMatchType.MATCH_ID_ATTRIB_NAME)) {
             ResourceMatchType matchType = (ResourceMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
@@ -44,7 +44,7 @@ public class ResourceMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshall
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ResourceMatchType matchType = (ResourceMatchType) parentXMLObject;
         
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 c9b5684..10f2640 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
@@ -43,7 +43,7 @@ public class ResourceTypeImpl extends AbstractXACMLObject implements ResourceTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResourceTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected ResourceTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
         resourceMatch = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImplBuilder.java
index 9289ff6..939e2f5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class ResourceTypeImplBuilder extends AbstractXACMLObjectBuilder<Resource
     }
 
     /** {@inheritDoc} */
-    public ResourceType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResourceType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResourceTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
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 f7c666e..833aff3 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
@@ -30,7 +30,7 @@ public class ResourceTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ResourceType resourceType = (ResourceType) parentXMLObject;
         
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 03e0903..8b6b5be 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
@@ -42,7 +42,7 @@ public class ResourcesTypeImpl extends AbstractXACMLObject implements ResourcesT
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    public ResourcesTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    public ResourcesTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
     
         resource = new XMLObjectChildrenList<>(this);
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImplBuilder.java
index ada5791..5858af1 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourcesTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class ResourcesTypeImplBuilder extends AbstractXACMLObjectBuilder<Resourc
     }
 
     /** {@inheritDoc} */
-    public ResourcesType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ResourcesType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResourcesTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 d96530b..a34b8e6 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
@@ -30,7 +30,7 @@ public class ResourcesTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         ResourcesType resourcesType = (ResourcesType) parentXMLObject;
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImpl.java
index 2ead128..6362285 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImpl.java
@@ -33,7 +33,8 @@ public class RuleCombinerParametersTypeImpl extends CombinerParametersTypeImpl i
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RuleCombinerParametersTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected RuleCombinerParametersTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
        // combinerParameters = new XMLObjectChildrenList<CombinerParameterType>(this);
     }
@@ -44,7 +45,7 @@ public class RuleCombinerParametersTypeImpl extends CombinerParametersTypeImpl i
     }
 
     /** {@inheritDoc} */
-    public void setRuleIdRef(String ref) {
+    public void setRuleIdRef(final String ref) {
         this.ruleIdRef = prepareForAssignment(this.ruleIdRef, ref);
     }
 }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImplBuilder.java
index 268acfe..68baf50 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.RuleCombinerParametersType;
 public class RuleCombinerParametersTypeImplBuilder extends AbstractXACMLObjectBuilder<RuleCombinerParametersType> {
 
     /** {@inheritDoc} */
-    public RuleCombinerParametersType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RuleCombinerParametersType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new RuleCombinerParametersTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 c8adb9b..2e9a1d7 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
@@ -32,7 +32,7 @@ public class RuleCombinerParametersTypeMarshaller extends AbstractXACMLObjectMar
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType)xmlObject;
         
         if(!Strings.isNullOrEmpty(ruleCombinerParametersType.getRuleIdRef())){
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 2940c1a..1774f3e 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
@@ -33,7 +33,7 @@ public class RuleCombinerParametersTypeUnmarshaller extends AbstractXACMLObjectU
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    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;
@@ -45,7 +45,7 @@ public class RuleCombinerParametersTypeUnmarshaller extends AbstractXACMLObjectU
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         RuleCombinerParametersType ruleCombinerParametersType = (RuleCombinerParametersType) parentXMLObject;
         
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 cc7dd11..091cad9 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
@@ -55,7 +55,7 @@ public class RuleTypeImpl extends AbstractXACMLObject implements RuleType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RuleTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected RuleTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
     }
     
@@ -85,27 +85,27 @@ public class RuleTypeImpl extends AbstractXACMLObject implements RuleType {
     }
 
     /** {@inheritDoc} */
-    public void setCondition(ConditionType newCondition) {
+    public void setCondition(final ConditionType newCondition) {
        this.condition = prepareForAssignment(this.condition,newCondition);
     }
 
     /** {@inheritDoc} */
-    public void setDescription(DescriptionType newDescription) {
+    public void setDescription(final DescriptionType newDescription) {
         this.description = prepareForAssignment(this.description,newDescription);
     }
 
     /** {@inheritDoc} */
-    public void setEffect(EffectType type) {
+    public void setEffect(final EffectType type) {
         this.effectType = prepareForAssignment(this.effectType,type);
     }
 
     /** {@inheritDoc} */
-    public void setRuleId(String id) {
+    public void setRuleId(final String id) {
         this.ruleId = prepareForAssignment(this.ruleId,id);
     }
 
     /** {@inheritDoc} */
-    public void setTarget(TargetType newTarget) {
+    public void setTarget(final TargetType newTarget) {
        this.target = prepareForAssignment(this.target,newTarget);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImplBuilder.java
index cee7f0e..43f0d4a 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class RuleTypeImplBuilder extends AbstractXACMLObjectBuilder<RuleType> {
     }
     
     /** {@inheritDoc} */
-    public RuleType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RuleType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RuleTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 83ef1bc..9af9e4c 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
@@ -33,7 +33,7 @@ public class RuleTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         RuleType ruleType = (RuleType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 6bea272..748aebe 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
@@ -36,7 +36,7 @@ public class RuleTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         RuleType ruleType = (RuleType) xmlObject;
       
         if(attribute.getLocalName().equals(RuleType.EFFECT_ATTRIB_NAME)){
@@ -52,7 +52,7 @@ public class RuleTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         RuleType ruleType = (RuleType) parentXMLObject;
         
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImpl.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImpl.java
index 27893d1..5866a48 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImpl.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImpl.java
@@ -43,7 +43,8 @@ public class SubjectAttributeDesignatorTypeImpl extends AttributeDesignatorTypeI
      * @param namespacePrefix
      *                the prefix for the given namespace
      */
-    protected SubjectAttributeDesignatorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectAttributeDesignatorTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -53,7 +54,7 @@ public class SubjectAttributeDesignatorTypeImpl extends AttributeDesignatorTypeI
     }
 
     /** {@inheritDoc} */
-    public void setSubjectCategory(String category) {
+    public void setSubjectCategory(final String category) {
         this.subjectCategory = prepareForAssignment(this.subjectCategory, category);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImplBuilder.java
index 7eb60e0..34af3bf 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeImplBuilder.java
@@ -21,13 +21,14 @@ import org.opensaml.xacml.impl.AbstractXACMLObjectBuilder;
 import org.opensaml.xacml.policy.SubjectAttributeDesignatorType;
 
 /**
- * Bilder for {@link SubjectAttributeDesignatorType}.
+ * Builder for {@link SubjectAttributeDesignatorType}.
  */
 public class SubjectAttributeDesignatorTypeImplBuilder
         extends AbstractXACMLObjectBuilder<SubjectAttributeDesignatorType> {
 
     /** {@inheritDoc} */
-    public SubjectAttributeDesignatorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectAttributeDesignatorType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new SubjectAttributeDesignatorTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 71a32c4..d5b2932 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
@@ -31,7 +31,7 @@ public class SubjectAttributeDesignatorTypeMarshaller extends AttributeDesignato
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {       
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         SubjectAttributeDesignatorType subjectAttributeDesignatorType = (SubjectAttributeDesignatorType) xmlObject;
         
         if(!Strings.isNullOrEmpty(subjectAttributeDesignatorType.getSubjectCategory())){            
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 ec3de4e..03395ec 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
@@ -30,7 +30,7 @@ public class SubjectAttributeDesignatorTypeUnmarshaller extends AttributeDesigna
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(SubjectAttributeDesignatorType.SUBJECT_CATEGORY_ATTRIB_NAME)){
             SubjectAttributeDesignatorType subjectAttributeDesignatorType = (SubjectAttributeDesignatorType) xmlObject;
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 499efe5..643c7c6 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
@@ -48,7 +48,8 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    public SubjectMatchTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    public SubjectMatchTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeChoice = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -86,7 +87,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
     }
 
     /** {@inheritDoc} */
-    public void setAttributeSelector(AttributeSelectorType selector) {
+    public void setAttributeSelector(final AttributeSelectorType selector) {
         AttributeSelectorType currentSelector = getAttributeSelector();
         if (currentSelector != null) {
             attributeChoice.remove(currentSelector);
@@ -96,12 +97,12 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
     }
 
     /** {@inheritDoc} */
-    public void setAttributeValue(AttributeValueType value) {
+    public void setAttributeValue(final AttributeValueType value) {
         attributeValue = prepareForAssignment(attributeValue, value);
     }
 
     /** {@inheritDoc} */
-    public void setSubjectAttributeDesignator(AttributeDesignatorType attribute) {
+    public void setSubjectAttributeDesignator(final AttributeDesignatorType attribute) {
         AttributeDesignatorType currentDesignator = getSubjectAttributeDesignator();
         if (currentDesignator != null) {
             attributeChoice.remove(currentDesignator);
@@ -111,7 +112,7 @@ public class SubjectMatchTypeImpl extends AbstractXACMLObject implements Subject
     }
 
     /** {@inheritDoc} */
-    public void setMatchId(String id) {
+    public void setMatchId(final String id) {
         matchId = prepareForAssignment(matchId, id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImplBuilder.java
index 60606fa..bcf0419 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeImplBuilder.java
@@ -29,7 +29,8 @@ public class SubjectMatchTypeImplBuilder extends AbstractXACMLObjectBuilder<Subj
     }
 
     /** {@inheritDoc} */
-    public SubjectMatchType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectMatchType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new SubjectMatchTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 dea0b32..93c40ea 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
@@ -30,7 +30,7 @@ public class SubjectMatchTypeMarshaller extends AbstractXACMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         SubjectMatchType matchType = (SubjectMatchType) xmlObject;
 
         if (!Strings.isNullOrEmpty(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 827fde0..edd5af9 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
@@ -33,7 +33,7 @@ public class SubjectMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(SubjectMatchType.MATCH_ID_ATTRIB_NAME)) {
             SubjectMatchType matchType = (SubjectMatchType) xmlObject;
             matchType.setMatchId(StringSupport.trimOrNull(attribute.getValue()));
@@ -44,7 +44,7 @@ public class SubjectMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshalle
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         SubjectMatchType matchType = (SubjectMatchType) parentXMLObject;
     
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 87ad804..fe5fa69 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
@@ -42,7 +42,7 @@ public class SubjectTypeImpl extends AbstractXACMLObject implements SubjectType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected SubjectTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
         subjectMatch = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImplBuilder.java
index 65f571e..33fc60c 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class SubjectTypeImplBuilder extends AbstractXACMLObjectBuilder<SubjectTy
     }
 
     /** {@inheritDoc} */
-    public SubjectType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
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 4d7d83a..56ca821 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
@@ -30,7 +30,7 @@ public class SubjectTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         SubjectType subjectType = (SubjectType) parentXMLObject;
         
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 66fd96d..089e0ff 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
@@ -41,7 +41,7 @@ public class SubjectsTypeImpl extends AbstractXACMLObject implements SubjectsTyp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectsTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected SubjectsTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix){
         super(namespaceURI,elementLocalName,namespacePrefix);
         subject = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImplBuilder.java
index fa348b6..9139904 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectsTypeImplBuilder.java
@@ -32,7 +32,7 @@ public class SubjectsTypeImplBuilder extends AbstractXACMLObjectBuilder<Subjects
     }
 
     /** {@inheritDoc} */
-    public SubjectsType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectsType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectsTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
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 9d710c6..a424dbb 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
@@ -30,7 +30,7 @@ public class SubjectsTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         SubjectsType subjectsType = (SubjectsType) parentXMLObject;
         
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 d512d68..3852f92 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
@@ -53,7 +53,7 @@ public class TargetTypeImpl extends AbstractXACMLObject implements TargetType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected TargetTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TargetTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);       
     }
 
@@ -98,22 +98,22 @@ public class TargetTypeImpl extends AbstractXACMLObject implements TargetType {
     }
 
     /**{@inheritDoc}*/
-    public void setActions(ActionsType newActions) {
+    public void setActions(final ActionsType newActions) {
         this.actions = prepareForAssignment(this.actions,newActions);
     }
 
     /**{@inheritDoc}*/
-    public void setEnvironments(EnvironmentsType newEnvironments) {
+    public void setEnvironments(final EnvironmentsType newEnvironments) {
         this.environments = prepareForAssignment(this.environments,newEnvironments);
     }
 
     /**{@inheritDoc}*/
-    public void setResources(ResourcesType newResources) {
+    public void setResources(final ResourcesType newResources) {
         this.resources = prepareForAssignment(this.resources,newResources);
     }
 
     /**{@inheritDoc}*/
-    public void setSubjects(SubjectsType newSubjects) {
+    public void setSubjects(final SubjectsType newSubjects) {
         this.subjects = prepareForAssignment(this.subjects,newSubjects);
     }
 }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImplBuilder.java
index 9cd4ac4..0107d38 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/TargetTypeImplBuilder.java
@@ -31,7 +31,7 @@ public class TargetTypeImplBuilder extends AbstractXACMLObjectBuilder<TargetType
     }
 
     /** {@inheritDoc}**/
-    public TargetType buildObject(String namespaceURI, String localName,String namespacePrefix) {
+    public TargetType buildObject(final String namespaceURI, final String localName,final String namespacePrefix) {
         return new TargetTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
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 00448a6..2496feb 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
@@ -34,7 +34,7 @@ public class TargetTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         TargetType targetType = (TargetType) parentXMLObject;
         
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 bcbb4b3..0aae695 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
@@ -44,7 +44,8 @@ public class VariableDefinitionTypeImpl extends AbstractXACMLObject implements V
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected VariableDefinitionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected VariableDefinitionTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
     }
     
@@ -54,7 +55,7 @@ public class VariableDefinitionTypeImpl extends AbstractXACMLObject implements V
     }
 
     /** {@inheritDoc} */
-    public void setExpression(ExpressionType newExpression) {
+    public void setExpression(final ExpressionType newExpression) {
         expression = prepareForAssignment(expression, newExpression);
     }
 
@@ -64,7 +65,7 @@ public class VariableDefinitionTypeImpl extends AbstractXACMLObject implements V
     }
 
     /** {@inheritDoc} */
-    public void setVariableId(String id) {
+    public void setVariableId(final String id) {
         this.variableId = prepareForAssignment(this.variableId,id);
 
     }
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImplBuilder.java
index 68c5a82..098f615 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.VariableDefinitionType;
 public class VariableDefinitionTypeImplBuilder extends AbstractXACMLObjectBuilder<VariableDefinitionType> {
 
     /** {@inheritDoc} */
-    public VariableDefinitionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public VariableDefinitionType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new VariableDefinitionTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 347de88..a7bf591 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
@@ -32,7 +32,7 @@ public class VariableDefinitionTypeMarshaller extends AbstractXACMLObjectMarshal
     
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
         
         if(!Strings.isNullOrEmpty(variableDefinitionType.getVariableId())){
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 ff75f5e..13f5548 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
@@ -33,7 +33,7 @@ public class VariableDefinitionTypeUnmarshaller extends AbstractXACMLObjectUnmar
     
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(VariableDefinitionType.VARIABLE_ID_ATTRIB_NAME)){
             VariableDefinitionType variableDefinitionType = (VariableDefinitionType) xmlObject;
@@ -45,7 +45,7 @@ public class VariableDefinitionTypeUnmarshaller extends AbstractXACMLObjectUnmar
     
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         
         if(childXMLObject instanceof ExpressionType){
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 70b7f7c..314b001 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
@@ -44,7 +44,8 @@ public class VariableReferenceTypeImpl extends AbstractXACMLObject implements Va
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected VariableReferenceTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix){
+    protected VariableReferenceTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI,elementLocalName,namespacePrefix);
         expressions = new XMLObjectChildrenList<>(this);
     }
@@ -60,7 +61,7 @@ public class VariableReferenceTypeImpl extends AbstractXACMLObject implements Va
     }
 
     /** {@inheritDoc} */
-    public void setVariableId(String id) {
+    public void setVariableId(final String id) {
        this.valiableId = prepareForAssignment(this.valiableId,id);
     }
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImplBuilder.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImplBuilder.java
index d79e76f..fecf9b9 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImplBuilder.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeImplBuilder.java
@@ -26,7 +26,8 @@ import org.opensaml.xacml.policy.VariableReferenceType;
 public class VariableReferenceTypeImplBuilder extends AbstractXACMLObjectBuilder<VariableReferenceType> {
 
     /** {@inheritDoc} */
-    public VariableReferenceType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public VariableReferenceType buildObject(final String namespaceURI, final String localName,
+            final String namespacePrefix) {
         return new VariableReferenceTypeImpl(namespaceURI,localName,namespacePrefix);
     }
 
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 c58106c..cf2c9b1 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
@@ -31,7 +31,7 @@ import com.google.common.base.Strings;
 public class VariableReferenceTypeMarshaller extends AbstractXACMLObjectMarshaller {
     
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
         
         if(!Strings.isNullOrEmpty(variableReferenceType.getVariableId())){
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 6db9ac5..05bb949 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
@@ -33,7 +33,7 @@ public class VariableReferenceTypeUnmarshaller extends AbstractXACMLObjectUnmars
 
     /** {@inheritDoc} */
     @Override
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         
         if(attribute.getLocalName().equals(VariableReferenceType.VARIABLE_ID_ATTRIB_NAME)){
             VariableReferenceType variableReferenceType = (VariableReferenceType) xmlObject;
@@ -45,7 +45,7 @@ public class VariableReferenceTypeUnmarshaller extends AbstractXACMLObjectUnmars
 
     /** {@inheritDoc} */
     @Override
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         
         if(childXMLObject instanceof ExpressionType){

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


More information about the commits mailing list