You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by co...@apache.org on 2015/05/05 14:23:13 UTC

[15/54] [abbrv] [partial] incubator-openaz git commit: Do an eclipse based "cleanup" on the project

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Obligation.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Obligation.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Obligation.java
index 3f9a0cc..1e30092 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Obligation.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Obligation.java
@@ -33,35 +33,32 @@ package com.att.research.xacml.api;
 import java.util.Collection;
 
 /**
- * Defines the API for objects that represent XACML Obligation elements.  Obligations are returned in Result elements to indicate actions a PEP must
- * enforce as part of a decision.
- *
+ * Defines the API for objects that represent XACML Obligation elements. Obligations are returned in Result
+ * elements to indicate actions a PEP must enforce as part of a decision.
  */
 public interface Obligation {
     /**
      * Gets the {@link Identifier} representing the XACML ObligationId for this <code>Obligation</code>.
      *
-     * @return the <code>Identifier</code> representing the XACML ObligationId for this <code>Obligation</code>.
+     * @return the <code>Identifier</code> representing the XACML ObligationId for this
+     *         <code>Obligation</code>.
      */
     Identifier getId();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s representing the XACML AttributeAssignment elements
-     * for this <code>Obligation</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeAssignment}s
+     * representing the XACML AttributeAssignment elements for this <code>Obligation</code>.
      *
-     * @return a <code>Collection</code> of the <code>AttributeAssignment</code>s representing the XACML AttributeAssignment elements
-     * for this <code>Obligation</code>.
+     * @return a <code>Collection</code> of the <code>AttributeAssignment</code>s representing the XACML
+     *         AttributeAssignment elements for this <code>Obligation</code>.
      */
     Collection<AttributeAssignment> getAttributeAssignments();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of the <code>Obligation</code> interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>Obligation</code>s (<code>o1</code> and <code>o2</code>) are equal if:
-     *                  {@code o1.getId().equals(o2.getId())} AND
-     *                  {@code o1.getAttributeAssignments()} is pairwise equal to {@code o2.getAttributeAssignments()}
+     * {@inheritDoc} Implementations of the <code>Obligation</code> interface must override the
+     * <code>equals</code> method with the following semantics: Two <code>Obligation</code>s (<code>o1</code>
+     * and <code>o2</code>) are equal if: {@code o1.getId().equals(o2.getId())} AND
+     * {@code o1.getAttributeAssignments()} is pairwise equal to {@code o2.getAttributeAssignments()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Request.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Request.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Request.java
index cb4edcd..e9f6019 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Request.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Request.java
@@ -35,15 +35,17 @@ import java.util.Collection;
 import java.util.Iterator;
 
 /**
- * Provides the API for objects that represent XACML Request elements.  Requests are used to specify the contents of a XACML decision request.
- *
+ * Provides the API for objects that represent XACML Request elements. Requests are used to specify the
+ * contents of a XACML decision request.
  */
 public interface Request {
 
     /**
-     * Gets the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults for this <code>Request</code>.
+     * Gets the {@link com.att.research.xacml.api.RequestDefaults} representing the XACML RequestDefaults for
+     * this <code>Request</code>.
      *
-     * @return the <code>RequestDefaults</code> representing the XACML RequestDefaults for this <code>Request</code>.
+     * @return the <code>RequestDefaults</code> representing the XACML RequestDefaults for this
+     *         <code>Request</code>.
      */
     RequestDefaults getRequestDefaults();
 
@@ -55,73 +57,83 @@ public interface Request {
     boolean getReturnPolicyIdList();
 
     /**
-     * Returns true if the results from multiple individual decisions for this <code>Request</code> should
-     * be combined into a single XACML Result.
+     * Returns true if the results from multiple individual decisions for this <code>Request</code> should be
+     * combined into a single XACML Result.
      *
      * @return true if multiple results should be combined, otherwise false.
      */
     boolean getCombinedDecision();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing XACML Attributes elements for
-     * this <code>Request</code>.  The <code>Collection</code> should not be modified.  Implementations are free to use unmodifiable lists
-     * to enforce this.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing
+     * XACML Attributes elements for this <code>Request</code>. The <code>Collection</code> should not be
+     * modified. Implementations are free to use unmodifiable lists to enforce this.
      *
-     * @return the <code>Collection</code> of <code>RequestAttributes</code> representing XACML Attributes elements for
-     * this <code>Request</code>.
+     * @return the <code>Collection</code> of <code>RequestAttributes</code> representing XACML Attributes
+     *         elements for this <code>Request</code>.
      */
     Collection<RequestAttributes> getRequestAttributes();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing XACML Attributes elements for
-     * this <code>Request</code> that contain {@link com.att.research.xacml.api.Attribute}s where <code>getIncludeInResults</code> is true.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributes} representing
+     * XACML Attributes elements for this <code>Request</code> that contain
+     * {@link com.att.research.xacml.api.Attribute}s where <code>getIncludeInResults</code> is true.
      *
-     * @return a <code>Collection</code> of <code>RequestAttributes</code> containing one or more <code>Attribute</code>s to include in results.
+     * @return a <code>Collection</code> of <code>RequestAttributes</code> containing one or more
+     *         <code>Attribute</code>s to include in results.
      */
     Collection<AttributeCategory> getRequestAttributesIncludedInResult();
 
     /**
-     * Gets an <code>Iterator</code> over all of the {@link com.att.research.xacml.api.RequestAttributes} objects
-     * found in this <code>Request</code> with the given {@link com.att.research.xacml.api.Identifier} representing a XACML Category.
+     * Gets an <code>Iterator</code> over all of the {@link com.att.research.xacml.api.RequestAttributes}
+     * objects found in this <code>Request</code> with the given {@link com.att.research.xacml.api.Identifier}
+     * representing a XACML Category.
      *
-     * @param category the <code>Identifier</code> representing the XACML Category of the <code>ReqestAttributes</code> to retrieve.
-     * @return an <code>Iterator</code> over all of the <code>RequestAttributes</code> whose Category matches the given <code>Identifier</code>
+     * @param category the <code>Identifier</code> representing the XACML Category of the
+     *            <code>ReqestAttributes</code> to retrieve.
+     * @return an <code>Iterator</code> over all of the <code>RequestAttributes</code> whose Category matches
+     *         the given <code>Identifier</code>
      */
     Iterator<RequestAttributes> getRequestAttributes(Identifier category);
 
     /**
-     * Gets a single matching <code>RequestAttributes</code> representing the XACML Attributes element with whose xml:Id matches the given <code>String</code>>
+     * Gets a single matching <code>RequestAttributes</code> representing the XACML Attributes element with
+     * whose xml:Id matches the given <code>String</code>>
      *
-     * @param xmlId the <code>String</code> representing the xml:Id of the <code>RequestAttributes</code> to retrieve
+     * @param xmlId the <code>String</code> representing the xml:Id of the <code>RequestAttributes</code> to
+     *            retrieve
      * @return the single matching <code>RequestAttributes</code> object or null if not found
      */
     RequestAttributes getRequestAttributesByXmlId(String xmlId);
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s representing XACML MultiRequest elements in this <code>Request</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestReference}s representing
+     * XACML MultiRequest elements in this <code>Request</code>.
      *
-     * @return the <code>Collection</code> of <code>RequestAttributes</code> representing XACML MultiRequest elements in this <code>Request</code>.
+     * @return the <code>Collection</code> of <code>RequestAttributes</code> representing XACML MultiRequest
+     *         elements in this <code>Request</code>.
      */
     Collection<RequestReference> getMultiRequests();
 
     /**
-     * Gets the {@link Status} representing the XACML Status element for the Request represented by this <code>Request</code>.
+     * Gets the {@link Status} representing the XACML Status element for the Request represented by this
+     * <code>Request</code>.
      *
-     * @return the <code>Status</code> representing the XACML Status element for the Request represented by this <code>Request</code>.
+     * @return the <code>Status</code> representing the XACML Status element for the Request represented by
+     *         this <code>Request</code>.
      */
     Status getStatus();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of the <code>Request</code> interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>Requests</code> (<code>r1</code> and <code>r2</code>) are equals if:
-     *                  {@code r1.getRequestDefaults() == null && r2.getRequestDefaults() == null} OR {@code r1.getRequestDefaults().equals(r2.getRequestDefaults())} AND
-     *                  {@code r1.getReturnPolicyIdList() == r2.getReturnPolicyIdList()} AND
-     *                  {@code r1.getCombinedDecision() == r2.getCombinedDecision()} AND
-     *                  {@code r1.getRequestAttributes()} is pairwise equal to {@code r2.getRequestAttributes()} AND
-     *                  {@code r1.getMultiRequests()} is pairwise equal to {@code r2.getMultiRequests()}
+     * {@inheritDoc} Implementations of the <code>Request</code> interface must override the
+     * <code>equals</code> method with the following semantics: Two <code>Requests</code> (<code>r1</code> and
+     * <code>r2</code>) are equals if:
+     * {@code r1.getRequestDefaults() == null && r2.getRequestDefaults() == null} OR
+     * {@code r1.getRequestDefaults().equals(r2.getRequestDefaults())} AND
+     * {@code r1.getReturnPolicyIdList() == r2.getReturnPolicyIdList()} AND
+     * {@code r1.getCombinedDecision() == r2.getCombinedDecision()} AND {@code r1.getRequestAttributes()} is
+     * pairwise equal to {@code r2.getRequestAttributes()} AND {@code r1.getMultiRequests()} is pairwise equal
+     * to {@code r2.getMultiRequests()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributes.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributes.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributes.java
index 0919d1e..faf6542 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributes.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributes.java
@@ -37,21 +37,22 @@ import org.w3c.dom.NodeList;
 
 /**
  * Defines the API for objects that represent XACML 3.0 Attributes elements within a Request by extending the
- * {@link AttributeCategory} interface with methods for accessing DOM {@link org.w3c.dom.Node}s
- * representing XACML 3.0 Content elements.
- *
+ * {@link AttributeCategory} interface with methods for accessing DOM {@link org.w3c.dom.Node}s representing
+ * XACML 3.0 Content elements.
  */
 public interface RequestAttributes extends AttributeCategory {
     /**
-     * Gets the root {@link org.w3c.dom.Node} from the XACML 3.0 Content element of an Attributes element in a Request.
+     * Gets the root {@link org.w3c.dom.Node} from the XACML 3.0 Content element of an Attributes element in a
+     * Request.
      *
-     * @return the root <code>Node</code> from the XACML 3.0 Content element of an Attributes element in a Request.
+     * @return the root <code>Node</code> from the XACML 3.0 Content element of an Attributes element in a
+     *         Request.
      */
     Node getContentRoot();
 
     /**
-     * Finds the {@link org.w3c.dom.Node} referenced by the given {@link javax.xml.xpath.XPathExpression} within the
-     * XACML Content element in this <code>RequestAttributes</code> object.
+     * Finds the {@link org.w3c.dom.Node} referenced by the given {@link javax.xml.xpath.XPathExpression}
+     * within the XACML Content element in this <code>RequestAttributes</code> object.
      *
      * @param xpathExpression the <code>XPathExpression</code> to apply to the Content element.
      * @return the <code>Node</code> returned by the given <code>XPathExpression</code> or null if not found.
@@ -59,30 +60,31 @@ public interface RequestAttributes extends AttributeCategory {
     Node getContentNodeByXpathExpression(XPathExpression xpathExpression);
 
     /**
-     * Finds the {@link org.w3c.dom.NodeList} referenced by the given {@link javax.xml.xpath.XPathExpression} within the
-     * XACML Content element in this <code>RequestAttributes</code> object.
+     * Finds the {@link org.w3c.dom.NodeList} referenced by the given {@link javax.xml.xpath.XPathExpression}
+     * within the XACML Content element in this <code>RequestAttributes</code> object.
      *
      * @param xpathExpression the <code>XPathExpression</code> to apply to the Content element.
-     * @return the <code>NodeList</code> containing all <code>Node</code>s that match the <code>XPathExpression</code>
+     * @return the <code>NodeList</code> containing all <code>Node</code>s that match the
+     *         <code>XPathExpression</code>
      */
     NodeList getContentNodeListByXpathExpression(XPathExpression xpathExpression);
 
     /**
-     * Returns the <code>String</code> representing the xml:Id attribute for the XACML Attributes element represented by
-     * this <code>RequestAttributes</code> object.
+     * Returns the <code>String</code> representing the xml:Id attribute for the XACML Attributes element
+     * represented by this <code>RequestAttributes</code> object.
      *
-     * @return the <code>String</code> representing the xml:Id attribute for the XACML Attributes element represented by
-     * this <code>RequestAttributes</code> object.  May be null.
+     * @return the <code>String</code> representing the xml:Id attribute for the XACML Attributes element
+     *         represented by this <code>RequestAttributes</code> object. May be null.
      */
     String getXmlId();
 
     /**
-     * Implementations of the <code>RequestAttributes</code> interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>RequestAttributes</code> objects (<code>r1</code> and <code>r2</code>) are equal if:
-     *                  {@code r1.super.equals(r2)} AND
-     *                  {@code r1.getContentRoot() == null && r2.getContentRoot() == null} OR {@code r1.getContentRoot().equals(r2.getContentRoot())} AND
-     *                  {@code r1.getXmlId() == null && r2.getXmlId() == null} OR {@code r1.getXmlId().equals(r2.getXmlId())}
+     * Implementations of the <code>RequestAttributes</code> interface must override the <code>equals</code>
+     * method with the following semantics: Two <code>RequestAttributes</code> objects (<code>r1</code> and
+     * <code>r2</code>) are equal if: {@code r1.super.equals(r2)} AND
+     * {@code r1.getContentRoot() == null && r2.getContentRoot() == null} OR
+     * {@code r1.getContentRoot().equals(r2.getContentRoot())} AND
+     * {@code r1.getXmlId() == null && r2.getXmlId() == null} OR {@code r1.getXmlId().equals(r2.getXmlId())}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributesReference.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributesReference.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributesReference.java
index d80e182..ee0ac8a 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributesReference.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestAttributesReference.java
@@ -32,23 +32,22 @@ package com.att.research.xacml.api;
 
 /**
  * Defines the API for objects that implement XACML AttributesReference elements.
- *
  */
 public interface RequestAttributesReference {
     /**
-     * Gets the <String> representing the xml:Id of the XACML AttributesReference element represented by this <code>RequestAttributesReference</code>
+     * Gets the <String> representing the xml:Id of the XACML AttributesReference element represented by this
+     * <code>RequestAttributesReference</code>
      *
-     * @return the <code>String</code> representing the xml:Id of the XACML AttributesReference element represented by this <code>RequestAttributesReference</code>
+     * @return the <code>String</code> representing the xml:Id of the XACML AttributesReference element
+     *         represented by this <code>RequestAttributesReference</code>
      */
     String getReferenceId();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of this interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>RequestAttributesReference</code>s (<code>r1</code> and <code>r2</code>) are equal if:
-     *                  {@code r1.getReferenceId() == null && r2.getReferenceId() == null} OR {@code r1.getReferenceId().equals(r2.getReferenceId())}
+     * {@inheritDoc} Implementations of this interface must override the <code>equals</code> method with the
+     * following semantics: Two <code>RequestAttributesReference</code>s (<code>r1</code> and <code>r2</code>)
+     * are equal if: {@code r1.getReferenceId() == null && r2.getReferenceId() == null} OR
+     * {@code r1.getReferenceId().equals(r2.getReferenceId())}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestDefaults.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestDefaults.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestDefaults.java
index f214bf5..7f26b1e 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestDefaults.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestDefaults.java
@@ -34,23 +34,21 @@ import java.net.URI;
 
 /**
  * Defines the API for objects that represent XACML RequestDefaults elements.
- *
  */
 public interface RequestDefaults {
     /**
-     * Returns the <code>URI</code> of the XPath version to use when applying XPath expressions to XML content.
+     * Returns the <code>URI</code> of the XPath version to use when applying XPath expressions to XML
+     * content.
      *
      * @return the <code>URI</code> of the XPath version.
      */
     URI getXPathVersion();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of this interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>RequestDefaults</code> (<code>r1</code> and <code>r2</code> are equal if:
-     *                  {@code r1.getXPathVersion() == null && r2.getXPathVersion() == null} OR {@code r1.getXPathVersion().equals(r2.getXPathVersion())}
+     * {@inheritDoc} Implementations of this interface must override the <code>equals</code> method with the
+     * following semantics: Two <code>RequestDefaults</code> (<code>r1</code> and <code>r2</code> are equal
+     * if: {@code r1.getXPathVersion() == null && r2.getXPathVersion() == null} OR
+     * {@code r1.getXPathVersion().equals(r2.getXPathVersion())}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestReference.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestReference.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestReference.java
index f809624..4582f6a 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestReference.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/RequestReference.java
@@ -33,27 +33,24 @@ package com.att.research.xacml.api;
 import java.util.Collection;
 
 /**
- * Defines the API for objects that represent XACML RequestReference elements.  RequestReference elements contain zero or more AttributesReference
- * elements and are used in multi-requests.
- *
+ * Defines the API for objects that represent XACML RequestReference elements. RequestReference elements
+ * contain zero or more AttributesReference elements and are used in multi-requests.
  */
 public interface RequestReference {
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributesReference}s contained
-     * in this <code>RequestReference</code>.  If there are no <code>RequestAttributesReference}s this method must return an empty <code>Collection</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.RequestAttributesReference}s
+     * contained in this <code>RequestReference</code>. If there are no
+     * <code>RequestAttributesReference}s this method must return an empty <code>Collection</code>.
      *
-     * @return the <code>Collection</code> of <code>RequestAttributesReference</code>s contained in this <code>RequestReference</code>.
+     * @return the <code>Collection</code> of <code>RequestAttributesReference</code>s contained in this
+     *         <code>RequestReference</code>.
      */
     Collection<RequestAttributesReference> getAttributesReferences();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of this interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>RequestReference</code>s (<code>r1</code> and <code>r2</code>) are equal if:
-     *
-     *                  {@code r1.getAttributesReferences()} is pair-wise equal to {@code r2.getAttributesReferences()}
+     * {@inheritDoc} Implementations of this interface must override the <code>equals</code> method with the
+     * following semantics: Two <code>RequestReference</code>s (<code>r1</code> and <code>r2</code>) are equal
+     * if: {@code r1.getAttributesReferences()} is pair-wise equal to {@code r2.getAttributesReferences()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Response.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Response.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Response.java
index 476663e..999413c 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Response.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Response.java
@@ -34,26 +34,22 @@ package com.att.research.xacml.api;
 import java.util.Collection;
 
 /**
- * Defines the API for objects that represent XACML Response documents.  Response documents wrap the Result elements for individual XACML
- * decision requests.
- *
+ * Defines the API for objects that represent XACML Response documents. Response documents wrap the Result
+ * elements for individual XACML decision requests.
  */
 public interface Response {
     /**
-     * Gets the <code>Collection</code> of {@link Result}s objects in this <code>Response</code>.  If
-     * there are no <code>Result</code>s, this method must return an empty <code>Collection</code>.
+     * Gets the <code>Collection</code> of {@link Result}s objects in this <code>Response</code>. If there are
+     * no <code>Result</code>s, this method must return an empty <code>Collection</code>.
      *
      * @return the <code>Collection</code> of {@link Result}s objects in this <code>Response</code>.
      */
     Collection<Result> getResults();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of this interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>Response</code>s (<code>r1</code> and <code>r2</code>) are equal if:
-     *                  {@code r1.getResults()} is pairwise equal to {@code r2.getResults()}
+     * {@inheritDoc} Implementations of this interface must override the <code>equals</code> method with the
+     * following semantics: Two <code>Response</code>s (<code>r1</code> and <code>r2</code>) are equal if:
+     * {@code r1.getResults()} is pairwise equal to {@code r2.getResults()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
index 8697bff..7f5e0e3 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
@@ -33,9 +33,8 @@ package com.att.research.xacml.api;
 import java.util.Collection;
 
 /**
- * Defines the API for objects that represent XACML Result elements.  Results communicate the Decision, Status, Attributes,
- * Obligations, and Advice for an individual decision request.
- *
+ * Defines the API for objects that represent XACML Result elements. Results communicate the Decision, Status,
+ * Attributes, Obligations, and Advice for an individual decision request.
  */
 public interface Result {
     /**
@@ -53,58 +52,58 @@ public interface Result {
     Status getStatus();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s int this <code>Result</code>.  If there
-     * are no <code>Obligation</code>s this method must return an empty <code>Collection</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s int this
+     * <code>Result</code>. If there are no <code>Obligation</code>s this method must return an empty
+     * <code>Collection</code>.
      *
-     * @return the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s <code>Result</code>.
+     * @return the <code>Collection</code> of {@link com.att.research.xacml.api.Obligation}s
+     *         <code>Result</code>.
      */
     Collection<Obligation> getObligations();
 
     /**
-     * Gets the <code>Collection</code> of {@link Advice} objects in this <code>Result</code>.  If there
-     * are no <code>Advice</code> codes this method must return an empty <code>Collection</code>.
+     * Gets the <code>Collection</code> of {@link Advice} objects in this <code>Result</code>. If there are no
+     * <code>Advice</code> codes this method must return an empty <code>Collection</code>.
      *
      * @return the <code>Collection</code> of <code>Advice</code> objects in this <code>Result</code>.
      */
     Collection<Advice> getAssociatedAdvice();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects in this <code>Result</code>.  If there
-     * are no <code>AttributeCategory</code> objects this method must return an empty <code>Collection</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.AttributeCategory} objects in
+     * this <code>Result</code>. If there are no <code>AttributeCategory</code> objects this method must
+     * return an empty <code>Collection</code>.
      *
-     * @return the <code>Collection</code> of <code>AttributeCategory</code> objects in this <code>Result</code>.
+     * @return the <code>Collection</code> of <code>AttributeCategory</code> objects in this
+     *         <code>Result</code>.
      */
     Collection<AttributeCategory> getAttributes();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to XACML 3.0 Policies
-     * that are in this <code>Result</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to
+     * XACML 3.0 Policies that are in this <code>Result</code>.
      *
      * @return the <code>Collection</code> of Policy <code>IdReference</code>s in this <code>Result</code>.
      */
     Collection<IdReference> getPolicyIdentifiers();
 
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to XACML 3.0 PolicySets
-     * that are in this <code>Result</code>.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.IdReference} objects referring to
+     * XACML 3.0 PolicySets that are in this <code>Result</code>.
      *
      * @return the <code>Collection</code> of PolicySet <code>IdReference</code>s in this <code>Result</code>.
      */
     Collection<IdReference> getPolicySetIdentifiers();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of this interface must override the <code>equals</code> method with the following semantics:
-     *
-     *          Two <code>Result</code>s (<code>r1</code> and <code>r2</code>) are equal if:
-     *                  {@code r1.getDecision() == r2.getDecision()} AND
-     *                  {@code r1.getStatus().equals(r2.getStatus()} AND
-     *                  {@code r1.getObligations()} is pair-wise equal to {@code r2.getObligations()}
-     *                  {@code r1.getAssociatedAdvice()} is pair-wise equal to {@code r2.getAssociatedAdvice()}
-     *                  {@code r1.getAttributes()} is pair-wise equal to {@code r2.getAttributes()}
-     *                  {@code r1.getPolicyIdentifiers()} is pair-wise equal to {@code r2.getPolicyIdentifiers()}
-     *                  {@code r1.getPolicySetIdentifiers()} is pair-wise equal to {@code r2.getPolicySetIdentifiers()}
+     * {@inheritDoc} Implementations of this interface must override the <code>equals</code> method with the
+     * following semantics: Two <code>Result</code>s (<code>r1</code> and <code>r2</code>) are equal if:
+     * {@code r1.getDecision() == r2.getDecision()} AND {@code r1.getStatus().equals(r2.getStatus()} AND
+     * {@code r1.getObligations()} is pair-wise equal to {@code r2.getObligations()}
+     * {@code r1.getAssociatedAdvice()} is pair-wise equal to {@code r2.getAssociatedAdvice()}
+     * {@code r1.getAttributes()} is pair-wise equal to {@code r2.getAttributes()}
+     * {@code r1.getPolicyIdentifiers()} is pair-wise equal to {@code r2.getPolicyIdentifiers()}
+     * {@code r1.getPolicySetIdentifiers()} is pair-wise equal to {@code r2.getPolicySetIdentifiers()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/SemanticString.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/SemanticString.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/SemanticString.java
index a543cb6..cd89737 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/SemanticString.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/SemanticString.java
@@ -31,15 +31,17 @@
 package com.att.research.xacml.api;
 
 /**
- * SemanticString is an interface for objects that have semantically significant <code>String</code> representations.  It differentiates
- * objects whose <code>toString</code> method represents debugging information rather than something that is meaningful at runtime.
- *
+ * SemanticString is an interface for objects that have semantically significant <code>String</code>
+ * representations. It differentiates objects whose <code>toString</code> method represents debugging
+ * information rather than something that is meaningful at runtime.
  */
 public interface SemanticString {
     /**
-     * Gets the semantically significant <code>String</code> representation of the object implementing this interface.
+     * Gets the semantically significant <code>String</code> representation of the object implementing this
+     * interface.
      *
-     * @return the semantically significant <code>String</code> representation of the object implementing this interface.
+     * @return the semantically significant <code>String</code> representation of the object implementing this
+     *         interface.
      */
     String stringValue();
 }

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Status.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Status.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Status.java
index e149e25..e3aec6e 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Status.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Status.java
@@ -32,7 +32,6 @@ package com.att.research.xacml.api;
 
 /**
  * Defines the API for objects that represent XACML Status elements.
- *
  */
 public interface Status {
     /**
@@ -50,23 +49,26 @@ public interface Status {
     String getStatusMessage();
 
     /**
-     * Gets the {@link com.att.research.xacml.api.StatusDetail} associated with this <code>Status</code> if there is any.
+     * Gets the {@link com.att.research.xacml.api.StatusDetail} associated with this <code>Status</code> if
+     * there is any.
      *
      * @return the <code>StatusDetail</code> for this <code>Status</code> if there is any.
      */
     StatusDetail getStatusDetail();
 
     /**
-     * Returns <code>true</code> if the <code>StatusCode</code> for this <code>Status</code> is the XACML OK value.
+     * Returns <code>true</code> if the <code>StatusCode</code> for this <code>Status</code> is the XACML OK
+     * value.
      *
-     * @return true if the <code>StatusCode</code> for this <code>Status</code> is the XACML OK value, else false
+     * @return true if the <code>StatusCode</code> for this <code>Status</code> is the XACML OK value, else
+     *         false
      */
     boolean isOk();
 
     /**
-     * Returns a <code>Status</code> with the same <code>StatusCode</code> and status message as this <code>Status</code>
-     * but whose <code>StatusDetail</code> is the merging of the <code>StatusDetail</code> in this <code>Status</code>
-     * and the <code>StatusDetail</code> in the given <code>Status</code>.
+     * Returns a <code>Status</code> with the same <code>StatusCode</code> and status message as this
+     * <code>Status</code> but whose <code>StatusDetail</code> is the merging of the <code>StatusDetail</code>
+     * in this <code>Status</code> and the <code>StatusDetail</code> in the given <code>Status</code>.
      *
      * @param status the <code>Status</code> whose <code>StatusDetail</code> is to be merged in
      * @return a <code>Status</code> with merged <code>StatusDetail</code>
@@ -74,14 +76,14 @@ public interface Status {
     Status merge(Status status);
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of the <code>Status</code> interface must override the <code>equals</code> method with the following semantics:
-     *
-     * Two <code>Status</code> objects (<code>s1</code> and <code>s2</code>) are equal if:
-     *          {@code s1.getStatusCode().equals(s2.getStatusCode())} AND
-     *          {@code s1.getStatusMessage() == null && s2.getStatusMessage() == null} OR {@code s1.getStatusMessage().equals(s2.getStatusMessage())}
-     *          {@code s1.getStatusDetail() == null && s2.getStatusDetail() == null} OR {@code s1.getStatusDetail().equals(s2.getStatusDetail())}
+     * {@inheritDoc} Implementations of the <code>Status</code> interface must override the
+     * <code>equals</code> method with the following semantics: Two <code>Status</code> objects (
+     * <code>s1</code> and <code>s2</code>) are equal if:
+     * {@code s1.getStatusCode().equals(s2.getStatusCode())} AND
+     * {@code s1.getStatusMessage() == null && s2.getStatusMessage() == null} OR
+     * {@code s1.getStatusMessage().equals(s2.getStatusMessage())}
+     * {@code s1.getStatusDetail() == null && s2.getStatusDetail() == null} OR
+     * {@code s1.getStatusDetail().equals(s2.getStatusDetail())}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusCode.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusCode.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusCode.java
index 8e91bf5..dce17e6 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusCode.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusCode.java
@@ -32,11 +32,11 @@ package com.att.research.xacml.api;
 
 /**
  * Defines the API for objects that represent XACML StatusCode values.
- *
  */
 public interface StatusCode {
     /**
-     * Retrieves the major status {@link com.att.research.xacmo.common.Identifier} for this <code>StatusCode</code>.
+     * Retrieves the major status {@link com.att.research.xacmo.common.Identifier} for this
+     * <code>StatusCode</code>.
      *
      * @return the major status <code>Identifier</code> for this <code>StatusCode</code>
      */
@@ -50,13 +50,10 @@ public interface StatusCode {
     StatusCode getChild();
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of the <code>StatusCode</code> interface must override the <code>equals</code> method as follows:
-     *
-     * Two <code>StatusCode</code>s (<code>s1</code> and <code>s2</code>) are equal if:
-     *          {@code s1.getIdentifer().equals(s2.getIdentifier()} AND
-     *          {@code s1.getChild() == null && s2.getChild() == null} OR {@code s1.getChild().equals(s2.getChild())}
+     * {@inheritDoc} Implementations of the <code>StatusCode</code> interface must override the
+     * <code>equals</code> method as follows: Two <code>StatusCode</code>s (<code>s1</code> and
+     * <code>s2</code>) are equal if: {@code s1.getIdentifer().equals(s2.getIdentifier()} AND
+     * {@code s1.getChild() == null && s2.getChild() == null} OR {@code s1.getChild().equals(s2.getChild())}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusDetail.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusDetail.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusDetail.java
index a16c54c..4f8d8f1 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusDetail.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/StatusDetail.java
@@ -34,33 +34,34 @@ import java.util.Collection;
 
 /**
  * Defines the API for objects that represent XACML StatusDetail elements.
- *
  */
 public interface StatusDetail {
     /**
-     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.MissingAttributeDetail} objects for this <code>StatusDetail</code>.
-     * If there are no <code>MissingAttributeDetail</code>s an empty <code>Collection</code> must be returned.
+     * Gets the <code>Collection</code> of {@link com.att.research.xacml.api.MissingAttributeDetail} objects
+     * for this <code>StatusDetail</code>. If there are no <code>MissingAttributeDetail</code>s an empty
+     * <code>Collection</code> must be returned.
      *
-     * @return the <code>MissingAttributeDetail</code> objects for this <code>StatusDetail</code> or null if none.
+     * @return the <code>MissingAttributeDetail</code> objects for this <code>StatusDetail</code> or null if
+     *         none.
      */
     Collection<MissingAttributeDetail> getMissingAttributeDetails();
 
     /**
-     * Gets a <code>StatusDetail</code> object that is the result of merging this <code>StatusDetail<code> with the
+     * Gets a <code>StatusDetail</code> object that is the result of merging this
+     * <code>StatusDetail<code> with the
      * given <code>StatusDetail</code>.
      *
      * @param statusDetail the <code>StatusDetail</code> to merge in
-     * @return a <code>StatusDetail</code> merging this <code>StatusDetail</code> with the given <code>StatusDetail</code>.
+     * @return a <code>StatusDetail</code> merging this <code>StatusDetail</code> with the given
+     *         <code>StatusDetail</code>.
      */
     StatusDetail merge(StatusDetail statusDetail);
 
     /**
-     * {@inheritDoc}
-     *
-     * Implementations of the <code>StatusDetail</code> interface must override the <code>equals</code> method as follows:
-     *
-     *          Two <code>StatusDetail</code>s (<code>s1</code> and <code>s2</code>) are equal if:
-     *                  {@code s1.getMissingAttributeDetails()} is pair-wise equal to {@code s2.getMissingAttributeDetails()}
+     * {@inheritDoc} Implementations of the <code>StatusDetail</code> interface must override the
+     * <code>equals</code> method as follows: Two <code>StatusDetail</code>s (<code>s1</code> and
+     * <code>s2</code>) are equal if: {@code s1.getMissingAttributeDetails()} is pair-wise equal to
+     * {@code s2.getMissingAttributeDetails()}
      */
     @Override
     boolean equals(Object obj);

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/Version.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/Version.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/Version.java
index 05a8bef..138b4a5 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/Version.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/Version.java
@@ -32,7 +32,6 @@ package com.att.research.xacml.api;
 
 /**
  * Version is the interface that objects that represent XACML VersionType attributes and elements implement.
- *
  */
 public interface Version extends Comparable<Version>, SemanticString {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/VersionMatch.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/VersionMatch.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/VersionMatch.java
index e62e9cb..d969ca4 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/VersionMatch.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/VersionMatch.java
@@ -31,9 +31,8 @@
 package com.att.research.xacml.api;
 
 /**
- * VersionMatch is the interface that objects implementing references to {@link Version} objects
- * must implement.
- *
+ * VersionMatch is the interface that objects implementing references to {@link Version} objects must
+ * implement.
  */
 public interface VersionMatch {
     /**
@@ -44,13 +43,10 @@ public interface VersionMatch {
     String getVersionMatch();
 
     /**
-     * Determines if the pattern in this <code>VersionMatch</code> matches the given <code>Version</code> based on the
-     * given comparison code.  Comparison code values are:
-     *  0 - match only if version numbers match the pattern
-     * -1 - match if the version numbers <= the pattern
-     *  1 - match if the version numbers >= the pattern
-     *
-     * Wildcard values are considered to match any comparison code
+     * Determines if the pattern in this <code>VersionMatch</code> matches the given <code>Version</code>
+     * based on the given comparison code. Comparison code values are: 0 - match only if version numbers match
+     * the pattern -1 - match if the version numbers <= the pattern 1 - match if the version numbers >= the
+     * pattern Wildcard values are considered to match any comparison code
      *
      * @param version the <code>Version</code> to match against
      * @param cmp integer comparision code

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/38b6d318/openaz-xacml/src/main/java/com/att/research/xacml/api/XACML.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/XACML.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/XACML.java
index 123cafe..809535c 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/XACML.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/XACML.java
@@ -35,83 +35,85 @@ import com.att.research.xacml.std.IdentifierImpl;
 
 /**
  * XACML defines a number of constants useful in processing XACML documents.
- *
  */
 public class XACML {
 
     protected XACML() {
     }
 
-    public static final String  XMLSCHEMA                       = "http://www.w3.org/2001/XMLSchema#";
-    public static final String  XPATHVERSION_1_0        = "http://www.w3.org/TR/1999/REC-xpath-19991116";
-    public static final String  XPATHVERSION_2_0        = "http://www.w3.org/TR/2007/REC-xpath20-20070123";
-    public static final String  XQUERYOPERATORS         = "http://www.w3.org/TR/2002/WD-xquery-operators-20020816";
+    public static final String XMLSCHEMA = "http://www.w3.org/2001/XMLSchema#";
+    public static final String XPATHVERSION_1_0 = "http://www.w3.org/TR/1999/REC-xpath-19991116";
+    public static final String XPATHVERSION_2_0 = "http://www.w3.org/TR/2007/REC-xpath20-20070123";
+    public static final String XQUERYOPERATORS = "http://www.w3.org/TR/2002/WD-xquery-operators-20020816";
 
     /*
      * URN builder components
      */
-    public static final String  URN_XACML                                       = "urn:oasis:names:tc:xacml";
-    public static final String  DATA_TYPE                                       = "data-type";
-    public static final String  RULE_COMBINING_ALGORITHM        = "rule-combining-algorithm";
-    public static final String  POLICY_COMBINING_ALGORITHM      = "policy-combining-algorithm";
-    public static final String  FUNCTION                                        = "function";
-    public static final String  ATTRIBUTE_CATEGORY                      = "attribute-category";
-    public static final String  SUBJECT_CATEGORY                        = "subject-category";
-    public static final String  SCOPE                                           = "scope";
-    public static final String  CONTENT_SELECTOR                        = "content-selector";
-    public static final String  MULTIPLE_CONTENT_SELECTOR       = "multiple" + CONTENT_SELECTOR;
-    public static final String  CONFORMANCE_TEST                        = "conformance-test";
-    public static final String  CONTEXT                                         = "context";
-    public static final String  EXAMPLE                                         = "example";
-    public static final String  ENVIRONMENT                                     = "environment";
-    public static final String  POLICY                                          = "policy";
-    public static final String  SUBJECT                                         = "subject";
-    public static final String  RESOURCE                                        = "resource";
-    public static final String  ACTION                                          = "action";
-    public static final String  ACTIONS                                         = "actions";
-    public static final String  PROFILE                                         = "profile";
-    public static final String  PROFILES                                        = "profiles";
+    public static final String URN_XACML = "urn:oasis:names:tc:xacml";
+    public static final String DATA_TYPE = "data-type";
+    public static final String RULE_COMBINING_ALGORITHM = "rule-combining-algorithm";
+    public static final String POLICY_COMBINING_ALGORITHM = "policy-combining-algorithm";
+    public static final String FUNCTION = "function";
+    public static final String ATTRIBUTE_CATEGORY = "attribute-category";
+    public static final String SUBJECT_CATEGORY = "subject-category";
+    public static final String SCOPE = "scope";
+    public static final String CONTENT_SELECTOR = "content-selector";
+    public static final String MULTIPLE_CONTENT_SELECTOR = "multiple" + CONTENT_SELECTOR;
+    public static final String CONFORMANCE_TEST = "conformance-test";
+    public static final String CONTEXT = "context";
+    public static final String EXAMPLE = "example";
+    public static final String ENVIRONMENT = "environment";
+    public static final String POLICY = "policy";
+    public static final String SUBJECT = "subject";
+    public static final String RESOURCE = "resource";
+    public static final String ACTION = "action";
+    public static final String ACTIONS = "actions";
+    public static final String PROFILE = "profile";
+    public static final String PROFILES = "profiles";
 
     /*
      * Full Identifiers from the URN components
      */
-    public static final Identifier ID_XACML                             = new IdentifierImpl(URN_XACML);
+    public static final Identifier ID_XACML = new IdentifierImpl(URN_XACML);
 
     /*
      * Data Type strings
      */
-    public static final String  DATATYPE_STRING                                 = XMLSCHEMA + "string";
-    public static final String  DATATYPE_BOOLEAN                                = XMLSCHEMA + "boolean";
-    public static final String  DATATYPE_INTEGER                                = XMLSCHEMA + "integer";
-    public static final String  DATATYPE_DOUBLE                                 = XMLSCHEMA + "double";
-    public static final String  DATATYPE_TIME                                   = XMLSCHEMA + "time";
-    public static final String  DATATYPE_DATE                                   = XMLSCHEMA + "date";
-    public static final String  DATATYPE_DATETIME                               = XMLSCHEMA + "dateTime";
-    public static final String  DATATYPE_DAYTIMEDURATION                = XMLSCHEMA + "dayTimeDuration";
-    public static final String  DATATYPE_YEARMONTHDURATION              = XMLSCHEMA + "yearMonthDuration";
-    public static final String  DATATYPE_ANYURI                                 = XMLSCHEMA + "anyURI";
-    public static final String  DATATYPE_HEXBINARY                              = XMLSCHEMA + "hexBinary";
-    public static final String  DATATYPE_BASE64BINARY                   = XMLSCHEMA + "base64Binary";
+    public static final String DATATYPE_STRING = XMLSCHEMA + "string";
+    public static final String DATATYPE_BOOLEAN = XMLSCHEMA + "boolean";
+    public static final String DATATYPE_INTEGER = XMLSCHEMA + "integer";
+    public static final String DATATYPE_DOUBLE = XMLSCHEMA + "double";
+    public static final String DATATYPE_TIME = XMLSCHEMA + "time";
+    public static final String DATATYPE_DATE = XMLSCHEMA + "date";
+    public static final String DATATYPE_DATETIME = XMLSCHEMA + "dateTime";
+    public static final String DATATYPE_DAYTIMEDURATION = XMLSCHEMA + "dayTimeDuration";
+    public static final String DATATYPE_YEARMONTHDURATION = XMLSCHEMA + "yearMonthDuration";
+    public static final String DATATYPE_ANYURI = XMLSCHEMA + "anyURI";
+    public static final String DATATYPE_HEXBINARY = XMLSCHEMA + "hexBinary";
+    public static final String DATATYPE_BASE64BINARY = XMLSCHEMA + "base64Binary";
 
-    public static final String  DATATYPE_WD_DAYTIMEDURATION             = XQUERYOPERATORS + "#dayTimeDuration";
-    public static final String  DATATYPE_WD_YEARMONTHDURATION   = XQUERYOPERATORS + "#yearMonthDuration";
+    public static final String DATATYPE_WD_DAYTIMEDURATION = XQUERYOPERATORS + "#dayTimeDuration";
+    public static final String DATATYPE_WD_YEARMONTHDURATION = XQUERYOPERATORS + "#yearMonthDuration";
 
     /*
      * Data Type identifiers
      */
-    public static final Identifier      ID_DATATYPE_STRING                                      = new IdentifierImpl(DATATYPE_STRING);
-    public static final Identifier      ID_DATATYPE_BOOLEAN                                     = new IdentifierImpl(DATATYPE_BOOLEAN);
-    public static final Identifier      ID_DATATYPE_INTEGER                                     = new IdentifierImpl(DATATYPE_INTEGER);
-    public static final Identifier      ID_DATATYPE_DOUBLE                                      = new IdentifierImpl(DATATYPE_DOUBLE);
-    public static final Identifier      ID_DATATYPE_TIME                                        = new IdentifierImpl(DATATYPE_TIME);
-    public static final Identifier      ID_DATATYPE_DATE                                        = new IdentifierImpl(DATATYPE_DATE);
-    public static final Identifier      ID_DATATYPE_DATETIME                            = new IdentifierImpl(DATATYPE_DATETIME);
-    public static final Identifier      ID_DATATYPE_DAYTIMEDURATION                     = new IdentifierImpl(DATATYPE_DAYTIMEDURATION);
-    public static final Identifier      ID_DATATYPE_YEARMONTHDURATION           = new IdentifierImpl(DATATYPE_YEARMONTHDURATION);
-    public static final Identifier      ID_DATATYPE_ANYURI                                      = new IdentifierImpl(DATATYPE_ANYURI);
-    public static final Identifier      ID_DATATYPE_HEXBINARY                           = new IdentifierImpl(DATATYPE_HEXBINARY);
-    public static final Identifier      ID_DATATYPE_BASE64BINARY                        = new IdentifierImpl(DATATYPE_BASE64BINARY);
+    public static final Identifier ID_DATATYPE_STRING = new IdentifierImpl(DATATYPE_STRING);
+    public static final Identifier ID_DATATYPE_BOOLEAN = new IdentifierImpl(DATATYPE_BOOLEAN);
+    public static final Identifier ID_DATATYPE_INTEGER = new IdentifierImpl(DATATYPE_INTEGER);
+    public static final Identifier ID_DATATYPE_DOUBLE = new IdentifierImpl(DATATYPE_DOUBLE);
+    public static final Identifier ID_DATATYPE_TIME = new IdentifierImpl(DATATYPE_TIME);
+    public static final Identifier ID_DATATYPE_DATE = new IdentifierImpl(DATATYPE_DATE);
+    public static final Identifier ID_DATATYPE_DATETIME = new IdentifierImpl(DATATYPE_DATETIME);
+    public static final Identifier ID_DATATYPE_DAYTIMEDURATION = new IdentifierImpl(DATATYPE_DAYTIMEDURATION);
+    public static final Identifier ID_DATATYPE_YEARMONTHDURATION = new IdentifierImpl(
+                                                                                      DATATYPE_YEARMONTHDURATION);
+    public static final Identifier ID_DATATYPE_ANYURI = new IdentifierImpl(DATATYPE_ANYURI);
+    public static final Identifier ID_DATATYPE_HEXBINARY = new IdentifierImpl(DATATYPE_HEXBINARY);
+    public static final Identifier ID_DATATYPE_BASE64BINARY = new IdentifierImpl(DATATYPE_BASE64BINARY);
 
-    public static final Identifier      ID_DATATYPE_WD_DAYTIMEDURATION          = new IdentifierImpl(DATATYPE_WD_DAYTIMEDURATION);
-    public static final Identifier      ID_DATATYPE_WD_YEARMONTHDURATION        = new IdentifierImpl(DATATYPE_WD_YEARMONTHDURATION);
+    public static final Identifier ID_DATATYPE_WD_DAYTIMEDURATION = new IdentifierImpl(
+                                                                                       DATATYPE_WD_DAYTIMEDURATION);
+    public static final Identifier ID_DATATYPE_WD_YEARMONTHDURATION = new IdentifierImpl(
+                                                                                         DATATYPE_WD_YEARMONTHDURATION);
 }