Change group/package namespace to eu.xenit.contentcloud.abac

tgeens · tgeens · commit 4890d01fe3b6 · 2021-03-04T09:40:44.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-group=eu.xenit.contentcloud
+group=eu.xenit.contentcloud.abac
 
 lombokVersion=1.18.16
 slf4jVersion =1.7.30
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/OpaConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/OpaConfiguration.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client;
+package eu.xenit.contentcloud.abac.opa.client;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/ReactiveOpaClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/ReactiveOpaClient.java
@@ -1,15 +1,15 @@
-package eu.xenit.contentcloud.opa.client;
+package eu.xenit.contentcloud.abac.opa.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.xenit.contentcloud.opa.client.api.CompileApi;
-import eu.xenit.contentcloud.opa.client.api.DataApi;
-import eu.xenit.contentcloud.opa.client.api.PolicyApi;
-import eu.xenit.contentcloud.opa.client.impl.DataComponent;
-import eu.xenit.contentcloud.opa.client.impl.CompileComponent;
-import eu.xenit.contentcloud.opa.client.impl.PolicyComponent;
-import eu.xenit.contentcloud.opa.client.rest.OpaRestClient;
-import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration.LogSpecification;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.DefaultOpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.api.DataApi;
+import eu.xenit.contentcloud.abac.opa.client.impl.PolicyComponent;
+import eu.xenit.contentcloud.abac.opa.client.api.CompileApi;
+import eu.xenit.contentcloud.abac.opa.client.api.PolicyApi;
+import eu.xenit.contentcloud.abac.opa.client.impl.DataComponent;
+import eu.xenit.contentcloud.abac.opa.client.impl.CompileComponent;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.RestClientConfiguration.LogSpecification;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.DefaultOpaRestClient;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Redirect;
 import java.time.Duration;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/CompileApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/CompileApi.java
@@ -1,7 +1,7 @@
-package eu.xenit.contentcloud.opa.client.api;
+package eu.xenit.contentcloud.abac.opa.client.api;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
-import eu.xenit.contentcloud.opa.rego.ast.QuerySet;
+import eu.xenit.contentcloud.abac.opa.rego.ast.QuerySet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/DataApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/DataApi.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.api;
+package eu.xenit.contentcloud.abac.opa.client.api;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/PolicyApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/PolicyApi.java
@@ -1,6 +1,6 @@
-package eu.xenit.contentcloud.opa.client.api;
+package eu.xenit.contentcloud.abac.opa.client.api;
 
-import eu.xenit.contentcloud.opa.rego.ast.AbstractSyntaxTree;
+import eu.xenit.contentcloud.abac.opa.rego.ast.AbstractSyntaxTree;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.Data;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/QueryApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/api/QueryApi.java
@@ -0,0 +1,5 @@
+package eu.xenit.contentcloud.abac.opa.client.api;
+
+public interface QueryApi {
+
+}
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/CompileComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/CompileComponent.java
@@ -1,7 +1,7 @@
-package eu.xenit.contentcloud.opa.client.impl;
+package eu.xenit.contentcloud.abac.opa.client.impl;
 
-import eu.xenit.contentcloud.opa.client.api.CompileApi;
-import eu.xenit.contentcloud.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.api.CompileApi;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/DataComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/DataComponent.java
@@ -1,7 +1,7 @@
-package eu.xenit.contentcloud.opa.client.impl;
+package eu.xenit.contentcloud.abac.opa.client.impl;
 
-import eu.xenit.contentcloud.opa.client.api.DataApi;
-import eu.xenit.contentcloud.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.api.DataApi;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/PolicyComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/PolicyComponent.java
@@ -1,8 +1,8 @@
-package eu.xenit.contentcloud.opa.client.impl;
+package eu.xenit.contentcloud.abac.opa.client.impl;
 
-import eu.xenit.contentcloud.opa.client.api.PolicyApi;
-import eu.xenit.contentcloud.opa.client.rest.OpaRestClient;
-import eu.xenit.contentcloud.opa.client.rest.http.MediaType;
+import eu.xenit.contentcloud.abac.opa.client.api.PolicyApi;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaRestClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaRestClient.java
@@ -1,7 +1,6 @@
-package eu.xenit.contentcloud.opa.client.rest;
+package eu.xenit.contentcloud.abac.opa.client.rest;
 
-import eu.xenit.contentcloud.opa.client.api.PolicyApi.DeletePolicyResponse;
-import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/RestClientConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/RestClientConfiguration.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest;
+package eu.xenit.contentcloud.abac.opa.client.rest;
 
 import java.util.function.Consumer;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaRestClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaRestClient.java
@@ -1,20 +1,17 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.xenit.contentcloud.opa.client.api.PolicyApi.DeletePolicyResponse;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.JacksonBodyConverter;
-import eu.xenit.contentcloud.opa.client.rest.http.HttpMethod;
-import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders;
-import eu.xenit.contentcloud.opa.client.rest.http.HttpStatusException;
-import eu.xenit.contentcloud.opa.client.rest.http.MediaType;
-import eu.xenit.contentcloud.opa.client.rest.OpaRestClient;
-import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.ConverterProcessor;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.StringConverter;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.JacksonBodyConverter;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpMethod;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpStatusException;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
+import eu.xenit.contentcloud.abac.opa.client.rest.RestClientConfiguration;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.ConverterProcessor;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.StringConverter;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -23,9 +20,7 @@
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java
@@ -1,7 +1,7 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
-import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.RequestLoggerConfiguration.LogDetail;
+import eu.xenit.contentcloud.abac.opa.client.rest.RestClientConfiguration;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.RequestLoggerConfiguration.LogDetail;
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/HttpEntity.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/HttpEntity.java
@@ -1,6 +1,6 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
-import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
 import java.util.Optional;
 
 public class HttpEntity {
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/HttpHeadersBuilder.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/HttpHeadersBuilder.java
@@ -1,6 +1,6 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
-import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/RequestLogger.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/RequestLogger.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
 import java.io.ByteArrayOutputStream;
 import java.net.http.HttpClient;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/RequestLoggerConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/RequestLoggerConfiguration.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/ConverterProcessor.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/ConverterProcessor.java
@@ -1,8 +1,8 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter;
 
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.HttpEntity;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext;
-import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.HttpEntity;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collection;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/HttpBodyConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/HttpBodyConverter.java
@@ -1,7 +1,7 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter;
 
-import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders;
-import eu.xenit.contentcloud.opa.client.rest.http.MediaType;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
 import java.util.Collection;
 import java.util.Objects;
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java
@@ -1,10 +1,10 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import eu.xenit.contentcloud.opa.client.rest.http.MediaType;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collection;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/StringConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/converter/StringConverter.java
@@ -1,6 +1,6 @@
-package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter;
+package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter;
 
-import eu.xenit.contentcloud.opa.client.rest.http.MediaType;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpMethod.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpMethod.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.http;
+package eu.xenit.contentcloud.abac.opa.client.rest.http;
 
 public enum HttpMethod {
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpRequestHeaders.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpRequestHeaders.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.http;
+package eu.xenit.contentcloud.abac.opa.client.rest.http;
 
 import java.nio.charset.Charset;
 import java.util.List;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpStatusException.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/HttpStatusException.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.http;
+package eu.xenit.contentcloud.abac.opa.client.rest.http;
 
 public class HttpStatusException extends RuntimeException {
 
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/MediaType.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/http/MediaType.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.client.rest.http;
+package eu.xenit.contentcloud.abac.opa.client.rest.http;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java
diff --git a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/abac/opa/client/OpaClientIntegrationTests.java b/opa-async-java-client/src/test/java/eu/xenit/contentcloud/abac/opa/client/OpaClientIntegrationTests.java
@@ -1,25 +1,25 @@
-package eu.xenit.contentcloud.opa.client;
+package eu.xenit.contentcloud.abac.opa.client;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import eu.xenit.contentcloud.opa.client.api.CompileApi;
-import eu.xenit.contentcloud.opa.client.api.CompileApi.PartialEvaluationRequest;
-import eu.xenit.contentcloud.opa.client.api.DataApi;
-import eu.xenit.contentcloud.opa.client.api.DataApi.GetDocumentResponse;
-import eu.xenit.contentcloud.opa.client.api.PolicyApi.ListPoliciesResponse;
-import eu.xenit.contentcloud.opa.client.rest.http.HttpStatusException;
+import eu.xenit.contentcloud.abac.opa.client.api.CompileApi;
+import eu.xenit.contentcloud.abac.opa.client.api.CompileApi.PartialEvaluationRequest;
+import eu.xenit.contentcloud.abac.opa.client.api.DataApi;
+import eu.xenit.contentcloud.abac.opa.client.api.DataApi.GetDocumentResponse;
+import eu.xenit.contentcloud.abac.opa.client.api.PolicyApi.ListPoliciesResponse;
+import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpStatusException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -63,11 +63,11 @@ void upsertPlainTextPolicy_shouldSucceed() throws IOException {
             String content = loadResourceAsString(PATH_EXAMPLE_1);
 
             var result = opaClient.upsertPolicy("example1", content).join();
-            assertThat(result).isNotNull();
+            Assertions.assertThat(result).isNotNull();
 
             var getPolicyResponse = opaClient.getPolicy("example1").join();
-            assertThat(getPolicyResponse.getResult()).isNotNull();
-            assertThat(getPolicyResponse.getResult().getRaw()).isEqualTo(content);
+            Assertions.assertThat(getPolicyResponse.getResult()).isNotNull();
+            Assertions.assertThat(getPolicyResponse.getResult().getRaw()).isEqualTo(content);
         }
 
         @Test
@@ -92,11 +92,11 @@ void deletePolicy_shouldSucceed() throws IOException {
 
             // fetch it first
             var upsertResponse = opaClient.getPolicy("example2").join();
-            assertThat(upsertResponse.getResult()).isNotNull();
+            Assertions.assertThat(upsertResponse.getResult()).isNotNull();
 
             // now delete it again
             var deleteResponse = opaClient.deletePolicy("example2").join();
-            assertThat(deleteResponse).isNotNull();
+            Assertions.assertThat(deleteResponse).isNotNull();
 
             // check that a GET gives an error
             assertThatExceptionOfType(CompletionException.class)
@@ -149,15 +149,15 @@ void regoPythonSample() throws ExecutionException, InterruptedException {
                     Map.of("min_radius", 4),
                     List.of("input.radius"))).get();
 
-            assertThat(compile).isNotNull();
-            assertThat(compile.getResult()).isNotNull();
-            assertThat(compile.getResult().getQueries())
+            Assertions.assertThat(compile).isNotNull();
+            Assertions.assertThat(compile.getResult()).isNotNull();
+            Assertions.assertThat(compile.getResult().getQueries())
                     .isNotNull()
                     .singleElement() // 1 query
-                    .satisfies(query -> assertThat(query)
+                    .satisfies(query -> Assertions.assertThat(query)
                             .singleElement() // 1 expression
-                            .satisfies(expr -> assertThat(expr.getTerms()).satisfies(terms -> {
-                                assertThat(terms).hasSize(3);
+                            .satisfies(expr -> Assertions.assertThat(expr.getTerms()).satisfies(terms -> {
+                                Assertions.assertThat(terms).hasSize(3);
                                 // 1: gte
                                 // 2: call(mul, call(mul, 3.14, input.radius), 2)
                                 // 3: 4
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/AbstractSyntaxTree.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/AbstractSyntaxTree.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.rego.ast;
+package eu.xenit.contentcloud.abac.opa.rego.ast;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Expression.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Expression.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.rego.ast;
+package eu.xenit.contentcloud.abac.opa.rego.ast;
 
 import java.util.List;
 import lombok.Data;
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Node.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Node.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.rego.ast;
+package eu.xenit.contentcloud.abac.opa.rego.ast;
 
 public interface Node {
     void accept(Visitor visitor);
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Package.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Package.java
@@ -0,0 +1,10 @@
+package eu.xenit.contentcloud.abac.opa.rego.ast;
+
+import eu.xenit.contentcloud.abac.opa.rego.ast.Term.ScalarValue;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class Package {
+    private List<ScalarValue> path;
+}
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Query.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Query.java
@@ -1,4 +1,4 @@
-package eu.xenit.contentcloud.opa.rego.ast;
+package eu.xenit.contentcloud.abac.opa.rego.ast;
 
 import java.util.ArrayList;
 import lombok.Data;
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/QuerySet.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/QuerySet.java
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Rule.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Rule.java
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Term.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Term.java
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Visitor.java b/rego-java/src/main/java/eu/xenit/contentcloud/abac/opa/rego/ast/Visitor.java
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java
diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Visitor.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Visitor.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-group=eu.xenit.contentcloud`
	`1`	`+group=eu.xenit.contentcloud.abac`
`2`	`2`
`3`	`3`	`lombokVersion=1.18.16`
`4`	`4`	`slf4jVersion =1.7.30`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package eu.xenit.contentcloud.opa.client;`
	`1`	`+package eu.xenit.contentcloud.abac.opa.client;`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
`4`	`4`	`import lombok.RequiredArgsConstructor;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package eu.xenit.contentcloud.abac.opa.client.api;
++
 +public interface QueryApi {
++
 +}