Dependency upgrades and change to assertj tests

att · Aug 31, 2023 · ec581db · ec581db
1 parent e10353f
commit ec581db
Show file tree

Hide file tree

Showing 96 changed files with 5,053 additions and 6,660 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,19 +68,19 @@
         <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
         <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
-        <version.guava>31.1-jre</version.guava>
-        <version.gson>2.9.0</version.gson>
-        <version.lombok>1.18.26</version.lombok>
+        <version.guava>32.1.2-jre</version.guava>
+        <version.gson>2.10.1</version.gson>
+        <version.lombok>1.18.28</version.lombok>
         <version.jetty>9.4.26.v20200117</version.jetty>
-        <version.httpclient>4.5.13</version.httpclient>
-        <version.servletapi>3.1.0</version.servletapi>
+        <version.httpclient>4.5.14</version.httpclient>
+        <version.servletapi>4.0.1</version.servletapi>
         <version.slf4j>1.7.30</version.slf4j>
-        <version.logback>1.4.7</version.logback>
-        <version.commons.io>2.11.0</version.commons.io>
-        <version.commons.lang3>3.12.0</version.commons.lang3>
-        <version.commons.codec>1.15</version.commons.codec>
+        <version.logback>1.4.11</version.logback>
+        <version.commons.io>2.13.0</version.commons.io>
+        <version.commons.lang3>3.13.0</version.commons.lang3>
+        <version.commons.codec>1.16.0</version.commons.codec>
         <version.commons.cli>1.5.0</version.commons.cli>
-        <version.commons.text>1.9</version.commons.text>
+        <version.commons.text>1.10</version.commons.text>
         <version.junit>4.13.2</version.junit>
         <version.log4j>2.11.0</version.log4j>
         <version.xmlapi>1.4.01</version.xmlapi>
@@ -306,9 +306,9 @@
                 <version>${version.logback}</version>
             </dependency>
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${version.junit}</version>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>5.10.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -388,7 +388,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>6.1.1</version>
+                    <version>8.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/xacml-pdp/pom.xml b/xacml-pdp/pom.xml
@@ -42,8 +42,8 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java b/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java
@@ -1,17 +1,14 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 package com.att.research.xacmlatt.pdp.policy;
 
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.DataTypeException;
 import com.att.research.xacml.api.Status;
 import com.att.research.xacml.api.StatusCode;
 import com.att.research.xacml.std.StdStatus;
 import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.datatypes.DataTypes;
 import com.att.research.xacmlatt.pdp.eval.EvaluationContext;
 import com.att.research.xacmlatt.pdp.eval.EvaluationException;
 

diff --git a/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/VariableMap.java b/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/VariableMap.java
@@ -1,6 +1,6 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 package com.att.research.xacmlatt.pdp.policy;
@@ -13,7 +13,6 @@
 import java.util.Map;
 
 import com.att.research.xacml.util.StringUtils;
-import com.google.common.collect.Iterators;
 
 /**
  * VariableMap is a collection of {@link com.att.research.xacmlatt.pdp.policy.VariableDefinition}s that are accessible by

diff --git a/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java b/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java
@@ -1,12 +1,11 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 
 package com.att.research.xacmlatt.pdp.policy.dom;
 
-import com.att.research.xacmlatt.pdp.policy.LexicalEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
@@ -18,7 +17,7 @@
 import com.att.research.xacml.std.dom.DOMProperties;
 import com.att.research.xacml.std.dom.DOMStructureException;
 import com.att.research.xacml.std.dom.DOMUtil;
-import com.att.research.xacmlatt.pdp.policy.Policy;
+import com.att.research.xacmlatt.pdp.policy.LexicalEnvironment;
 import com.att.research.xacmlatt.pdp.policy.expressions.Apply;
 
 /**

diff --git a/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java b/xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java
@@ -1,12 +1,11 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 
 package com.att.research.xacmlatt.pdp.policy.dom;
 
-import com.att.research.xacmlatt.pdp.policy.LexicalEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
@@ -20,7 +19,7 @@
 import com.att.research.xacml.std.dom.DOMStructureException;
 import com.att.research.xacml.std.dom.DOMUtil;
 import com.att.research.xacmlatt.pdp.policy.Expression;
-import com.att.research.xacmlatt.pdp.policy.Policy;
+import com.att.research.xacmlatt.pdp.policy.LexicalEnvironment;
 import com.att.research.xacmlatt.pdp.policy.expressions.AttributeValueExpression;
 import com.att.research.xacmlatt.pdp.policy.expressions.Function;
 import com.att.research.xacmlatt.pdp.policy.expressions.VariableReference;

diff --git a/...l-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMQuantifiedExpression.java b/...l-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMQuantifiedExpression.java
@@ -1,24 +1,29 @@
 /*
  * Copyright (c) 2021, salesforce.com, inc.
+ * Copyright (c) 2023, AT&T Inc.
  * All rights reserved.
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 package com.att.research.xacmlatt.pdp.policy.dom;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import com.att.research.xacml.api.XACML3;
 import com.att.research.xacml.std.StdStatusCode;
 import com.att.research.xacml.std.dom.DOMProperties;
 import com.att.research.xacml.std.dom.DOMStructureException;
 import com.att.research.xacml.std.dom.DOMUtil;
 import com.att.research.xacmlatt.pdp.policy.LexicalEnvironment;
-import com.att.research.xacmlatt.pdp.policy.Policy;
-import com.att.research.xacmlatt.pdp.policy.expressions.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import com.att.research.xacmlatt.pdp.policy.expressions.ForAll;
+import com.att.research.xacmlatt.pdp.policy.expressions.ForAny;
+import com.att.research.xacmlatt.pdp.policy.expressions.Map;
+import com.att.research.xacmlatt.pdp.policy.expressions.QuantifiedExpression;
+import com.att.research.xacmlatt.pdp.policy.expressions.Select;
 
 /**
  * DOMQuantifiedExpression acts as a factory class for the various types of {@link QuantifiedExpression} from DOM
@@ -81,7 +86,6 @@ public static QuantifiedExpression newInstance(Node nodeQuantifiedExpression, Le
                 for (int i = 0 ; i < numChildren ; i++) {
                     Node child	= children.item(i);
                     if (child.getNodeType() == Node.ELEMENT_NODE && XACML3.XMLNS.equals(child.getNamespaceURI())) {
-                        String childName	= child.getLocalName();
                         if (DOMExpression.isExpression(child)) {
                             if (quantifiedExpression.getDomainExpression() == null) {
                                 quantifiedExpression.setDomainExpression(DOMExpression.newInstance(child, quantifiedExpression));

diff --git a/...p/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java b/...p/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java
@@ -1,22 +1,27 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 package com.att.research.xacmlatt.pdp.policy.expressions;
 
 import java.util.Collection;
-import java.util.Iterator;
 
-import com.att.research.xacml.api.*;
+import com.att.research.xacml.api.Attribute;
+import com.att.research.xacml.api.AttributeValue;
+import com.att.research.xacml.api.Identifier;
+import com.att.research.xacml.api.MissingAttributeDetail;
+import com.att.research.xacml.api.RequestAttributes;
+import com.att.research.xacml.api.Status;
+import com.att.research.xacml.api.StatusCode;
+import com.att.research.xacml.api.StatusDetail;
 import com.att.research.xacml.api.pip.PIPException;
 import com.att.research.xacml.api.pip.PIPRequest;
 import com.att.research.xacml.api.pip.PIPResponse;
 import com.att.research.xacml.std.StdMutableMissingAttributeDetail;
 import com.att.research.xacml.std.StdStatus;
 import com.att.research.xacml.std.StdStatusCode;
 import com.att.research.xacml.std.StdStatusDetail;
-import com.att.research.xacml.std.pip.StdMutablePIPResponse;
 import com.att.research.xacml.std.pip.StdPIPRequest;
 import com.att.research.xacml.std.pip.engines.EntityEngine;
 import com.att.research.xacmlatt.pdp.eval.EvaluationContext;

diff --git a/...pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java b/...pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java
@@ -1,6 +1,6 @@
 /*
  *
- *          Copyright (c) 2013,2019  AT&T Knowledge Ventures
+ *          Copyright (c) 2013,2019, 2023  AT&T Knowledge Ventures
  *                     SPDX-License-Identifier: MIT
  */
 package com.att.research.xacmlatt.pdp.policy.expressions;
@@ -16,7 +16,6 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import com.google.common.collect.Iterators;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

diff --git a/...java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionAttributeSelector.java b/...java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionAttributeSelector.java
@@ -1,11 +1,16 @@
 /*
  * Copyright (c) 2021, salesforce.com, inc.
+ * Modifications Copyright (c) 2023, AT&T Inc.
  * All rights reserved.
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 package com.att.research.xacmlatt.pdp.std.functions;
 
+import java.net.URI;
+import java.util.Iterator;
+import java.util.List;
+
 import com.att.research.xacml.api.Identifier;
 import com.att.research.xacml.api.RequestAttributes;
 import com.att.research.xacml.api.Status;
@@ -22,12 +27,6 @@
 import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
 import com.att.research.xacmlatt.pdp.policy.expressions.AttributeSelector;
 
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * FunctionDefinitionAttributeSelector implements {@link FunctionDefinition} to implement the
  * <a href="https://docs.oasis-open.org/xacml/xacml-3.0-related-entities/v1.0/cs02/xacml-3.0-related-entities-v1.0-cs02.html">

diff --git a/xacml-pdp/src/test/java/com/att/research/xacmlatt/pdp/policy/expressions/AnyOfAnyTest.java b/xacml-pdp/src/test/java/com/att/research/xacmlatt/pdp/policy/expressions/AnyOfAnyTest.java
@@ -1,21 +1,32 @@
+/*
+ *
+ *          Copyright (c) 2023  AT&T Inc.
+ *                     SPDX-License-Identifier: MIT
+ */
 package com.att.research.xacmlatt.pdp.policy.expressions;
 
-import com.att.research.xacml.api.AttributeValue;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
 import com.att.research.xacml.api.Identifier;
 import com.att.research.xacml.api.XACML3;
-import com.att.research.xacml.std.*;
+import com.att.research.xacml.std.IdentifierImpl;
+import com.att.research.xacml.std.StdAttributeValue;
+import com.att.research.xacml.std.StdMutableAttribute;
+import com.att.research.xacml.std.StdMutableRequest;
+import com.att.research.xacml.std.StdMutableRequestAttributes;
+import com.att.research.xacml.std.StdStatus;
 import com.att.research.xacml.std.datatypes.DataTypeBoolean;
 import com.att.research.xacmlatt.pdp.policy.Bag;
 import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
 import com.att.research.xacmlatt.pdp.policy.FunctionArgumentExpression;
 import com.att.research.xacmlatt.pdp.std.StdEvaluationContext;
 import com.att.research.xacmlatt.pdp.std.StdFunctions;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
 
-import static org.junit.Assert.assertEquals;
 
 public class AnyOfAnyTest {
     @Test
@@ -29,8 +40,8 @@ public void testSingleMatchWithDifferentLength() {
                 new FunctionArgumentExpression(new QuantifiedExpressionTest.MockExpression(
                         ExpressionResult.newBag(newBag("zero", "two", "four"))), evaluationContext, null)
         ));
-        assertEquals(StdStatus.STATUS_OK, result.getStatus());
-        assertEquals(DataTypeBoolean.AV_TRUE, result.getValue());
+        assertThat(StdStatus.STATUS_OK).isEqualTo(result.getStatus());
+        assertThat(DataTypeBoolean.AV_TRUE).isEqualTo(result.getValue());
     }
 
     @Test
@@ -64,8 +75,8 @@ public void testSingleMatchWithAttributeDesignators() {
                 new FunctionArgumentExpression(attributeDesignator1, evaluationContext, null),
                 new FunctionArgumentExpression(attributeDesignator2, evaluationContext, null)
         ));
-        assertEquals(StdStatus.STATUS_OK, result.getStatus());
-        assertEquals(DataTypeBoolean.AV_TRUE, result.getValue());
+        assertThat(StdStatus.STATUS_OK).isEqualTo(result.getStatus());
+        assertThat(DataTypeBoolean.AV_TRUE).isEqualTo(result.getValue());
     }
 
     @Test
@@ -79,8 +90,8 @@ public void testSingleMatch() {
                 new FunctionArgumentExpression(new QuantifiedExpressionTest.MockExpression(
                         ExpressionResult.newBag(newBag("zero", "two", "four"))), evaluationContext, null)
         ));
-        assertEquals(StdStatus.STATUS_OK, result.getStatus());
-        assertEquals(DataTypeBoolean.AV_TRUE, result.getValue());
+        assertThat(StdStatus.STATUS_OK).isEqualTo(result.getStatus());
+        assertThat(DataTypeBoolean.AV_TRUE).isEqualTo(result.getValue());
     }
 
     @Test
@@ -94,8 +105,8 @@ public void testAllMatch() {
                 new FunctionArgumentExpression(new QuantifiedExpressionTest.MockExpression(
                         ExpressionResult.newBag(newBag("one", "two", "three"))), evaluationContext, null)
         ));
-        assertEquals(StdStatus.STATUS_OK, result.getStatus());
-        assertEquals(DataTypeBoolean.AV_TRUE, result.getValue());
+        assertThat(StdStatus.STATUS_OK).isEqualTo(result.getStatus());
+        assertThat(DataTypeBoolean.AV_TRUE).isEqualTo(result.getValue());
     }
 
     @Test
@@ -109,8 +120,8 @@ public void testNoMatch() {
                 new FunctionArgumentExpression(new QuantifiedExpressionTest.MockExpression(
                         ExpressionResult.newBag(newBag("four", "five", "six"))), evaluationContext, null)
         ));
-        assertEquals(StdStatus.STATUS_OK, result.getStatus());
-        assertEquals(DataTypeBoolean.AV_FALSE, result.getValue());
+        assertThat(StdStatus.STATUS_OK).isEqualTo(result.getStatus());
+        assertThat(DataTypeBoolean.AV_FALSE).isEqualTo(result.getValue());
     }
     private Bag newBag(String... values) {
         Bag bag = new Bag();