Fix terms equality checks

Author: tgeens

README.md

@@ -1,4 +1,4 @@
-# opa-async-java-client
+# opa-java-client
 ![build](https://github.com/content-cloud/opa-java-client/workflows/build/badge.svg?branch=main)
 
 An asynchronous java client library for the [OpenPolicyAgent](https://www.openpolicyagent.org/) [REST API](https://www.openpolicyagent.org/docs/latest/rest-api/).

opa-async-java-client/src/main/java/eu/contentcloud/opa/client/api/QueryApi.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 public interface QueryApi {
 
@@ -15,6 +16,7 @@ class QueryResponse {
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = true)
     class QueryResultEntry extends HashMap<String, Object> {
 
     }

opa-async-java-client/src/test/java/eu/contentcloud/opa/client/OpaClientIntegrationTests.java

@@ -5,6 +5,11 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
 
 import eu.contentcloud.abac.opa.rego.ast.AbstractSyntaxTree;
+import eu.contentcloud.abac.opa.rego.ast.Expression;
+import eu.contentcloud.abac.opa.rego.ast.Query;
+import eu.contentcloud.abac.opa.rego.ast.QuerySet;
+import eu.contentcloud.abac.opa.rego.ast.Term;
+import eu.contentcloud.abac.opa.rego.ast.Term.Ref;
 import eu.contentcloud.opa.client.api.CompileApi;
 import eu.contentcloud.opa.client.api.CompileApi.PartialEvaluationRequest;
 import eu.contentcloud.opa.client.api.DataApi;
@@ -312,8 +317,9 @@ class Scenarios {
         /**
          * Scenario for partial evaluation of a policy, based on 'group' attribute on a set of documents/results
          *
-         * Context: 1. A user is member of a set of groups, expressed via an array as `input.user.groups[]` 2. Documents
-         * have a (single) `group` attribute.
+         * Context:
+         * 1. A user is member of a set of groups, expressed via an array as `input.user.groups[]`
+         * 2. Documents have a (single) `group` attribute.
          *
          * Policy: A user can access a document, when the document has a `group` attribute that matches with a group
          * from his users' profile.
@@ -327,25 +333,33 @@ void partialEval_getApiDocuments() {
                     "data.test.allow == true",
                     Map.of("method", "GET",
                             "path", List.of("api", "documents"),
-                            "user", Map.of("group", List.of("my-group"))
+                            "user", Map.of("group", List.of("group-a", "group-b"))
                     ),
                     List.of("data.documents")
             ).join();
+
             assertThat(result).isNotNull();
             assertThat(result.getResult()).isNotNull();
-            assertThat(result.getResult().getQueries())
-                    .singleElement()
-                    .satisfies(query -> Assertions.assertThat(query)
-                            .singleElement()
-                            .satisfies(expr -> {
-                                assertThat(expr.getIndex()).isEqualTo(0);
-                                var terms = expr.getTerms();
-                                assertThat(terms).hasSize(3);
-                                assertThat(terms.get(0).toString()).isEqualTo("eq");
-                                assertThat(terms.get(1).toString()).isEqualTo("\"my-group\"");
-                                assertThat(terms.get(2).toString())
-                                        .isEqualTo("data[\"documents\"][$11][\"group\"]");
-                            }));
+            assertThat(result.getResult().getQueries()).containsExactly(
+                    new Query(new Expression(0, List.of(
+                            new Ref(List.of(new Term.Var("eq"))),
+                            new Term.Text("group-a"),
+                            new Ref(List.of(
+                                    new Term.Var("data"),
+                                    new Term.Text("documents"),
+                                    new Term.Var("$11"),
+                                    new Term.Text("group")))
+
+                    ))), new Query(new Expression(0, List.of(
+                            new Ref(List.of(new Term.Var("eq"))),
+                            new Term.Text("group-b"),
+                            new Ref(List.of(
+                                    new Term.Var("data"),
+                                    new Term.Text("documents"),
+                                    new Term.Var("$11"),
+                                    new Term.Text("group")))
+                    ))));
+
         }
 
         /**

rego-java/src/main/java/eu/contentcloud/abac/opa/rego/ast/Expression.java

@@ -12,6 +12,10 @@ public class Expression implements Node {
     long index;
     List<? extends Term> terms;
 
+    public Expression(long index, Term ... terms) {
+        this(index, List.of(terms));
+    }
+
     @Override
     public <T> T accept(RegoVisitor<T> visitor) {
         return visitor.visit(this);

rego-java/src/main/java/eu/contentcloud/abac/opa/rego/ast/Query.java

@@ -1,13 +1,25 @@
 package eu.contentcloud.abac.opa.rego.ast;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public
-class Query extends ArrayList<Expression> implements Node {
+public class Query extends ArrayList<Expression> implements Node {
+
+    public Query(@NonNull Expression expression) {
+        this(List.of(expression));
+    }
+
+    public Query(Collection<Expression> expression) {
+        super(expression);
+    }
 
 
     @Override

rego-java/src/main/java/eu/contentcloud/abac/opa/rego/ast/QuerySet.java

@@ -1,13 +1,23 @@
 package eu.contentcloud.abac.opa.rego.ast;
 
 import java.util.ArrayList;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class QuerySet extends ArrayList<Query> implements Node{
+public class QuerySet extends ArrayList<Query> implements Node {
 
+    public QuerySet(List<Query> queries) {
+        super(queries);
+    }
+
+    public QuerySet(Query ... queries) {
+        this(List.of(queries));
+    }
 
     @Override
     public <T> T accept(RegoVisitor<T> visitor) {