diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d4ff8d..847cd6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 0.2.0 - 2021-07-20 Changed: -* Moved maven group coordinates to `eu.xenit.contentcloud.thunx` +* Moved maven group coordinates to `eu.xenit.contentcloud` * Change OPA term `Numeric` parameterized type from `Number` to `BigDecimal` * Make http-log-spec configurable from `OpaClient.Builder` diff --git a/README.md b/README.md index 5548659..5436abf 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,14 @@ interface. Using Gradle: ```groovy -implementation "eu.xenit.contentcloud.thunx:opa-async-java-client:${version}" +implementation "eu.xenit.contentcloud:opa-async-java-client:${version}" ``` Using Maven: ```xml - eu.xenit.contentcloud.thunx + eu.xenit.contentcloud opa-async-java-client ${version} diff --git a/gradle.properties b/gradle.properties index 87a063e..3f5e57b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -group=eu.xenit.contentcloud.thunx +group=eu.xenit.contentcloud lombokVersion=1.18.16 slf4jVersion =1.7.30 diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/OpaClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java similarity index 83% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/OpaClient.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java index fc2564a..c458b27 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/OpaClient.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java @@ -1,17 +1,17 @@ -package eu.xenit.contentcloud.thunx.opa.client; +package eu.xenit.contentcloud.opa.client; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.xenit.contentcloud.thunx.opa.client.api.CompileApi; -import eu.xenit.contentcloud.thunx.opa.client.api.DataApi; -import eu.xenit.contentcloud.thunx.opa.client.api.PolicyApi; -import eu.xenit.contentcloud.thunx.opa.client.api.QueryApi; -import eu.xenit.contentcloud.thunx.opa.client.impl.CompileComponent; -import eu.xenit.contentcloud.thunx.opa.client.impl.DataComponent; -import eu.xenit.contentcloud.thunx.opa.client.impl.PolicyComponent; -import eu.xenit.contentcloud.thunx.opa.client.impl.QueryComponent; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; -import eu.xenit.contentcloud.thunx.opa.client.rest.RestClientConfiguration.LogSpecification; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.DefaultOpaHttpClient; +import eu.xenit.contentcloud.opa.client.api.CompileApi; +import eu.xenit.contentcloud.opa.client.api.DataApi; +import eu.xenit.contentcloud.opa.client.api.QueryApi; +import eu.xenit.contentcloud.opa.client.api.PolicyApi; +import eu.xenit.contentcloud.opa.client.impl.CompileComponent; +import eu.xenit.contentcloud.opa.client.impl.DataComponent; +import eu.xenit.contentcloud.opa.client.impl.PolicyComponent; +import eu.xenit.contentcloud.opa.client.impl.QueryComponent; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration.LogSpecification; +import eu.xenit.contentcloud.opa.client.rest.client.jdk.DefaultOpaHttpClient; 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/thunx/opa/client/OpaConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaConfiguration.java similarity index 77% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/OpaConfiguration.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaConfiguration.java index d929f49..9d69f7c 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/OpaConfiguration.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client; +package eu.xenit.contentcloud.opa.client; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/CompileApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java similarity index 93% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/CompileApi.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java index 9fb124e..196626e 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/CompileApi.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.api; +package eu.xenit.contentcloud.opa.client.api; import com.fasterxml.jackson.annotation.JsonAnySetter; -import eu.xenit.contentcloud.thunx.opa.rego.ast.QuerySet; +import eu.xenit.contentcloud.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/thunx/opa/client/api/DataApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/DataApi.java similarity index 89% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/DataApi.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/DataApi.java index a0b5514..10d6be9 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/DataApi.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/DataApi.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.api; +package eu.xenit.contentcloud.opa.client.api; import java.util.concurrent.CompletableFuture; import lombok.Data; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/PolicyApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java similarity index 87% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/PolicyApi.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java index 1c69aba..6cdf895 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/PolicyApi.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.thunx.opa.client.api; +package eu.xenit.contentcloud.opa.client.api; -import eu.xenit.contentcloud.thunx.opa.rego.ast.AbstractSyntaxTree; +import eu.xenit.contentcloud.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/thunx/opa/client/api/QueryApi.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java similarity index 89% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/QueryApi.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java index 8ca36fc..22e8638 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/api/QueryApi.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.api; +package eu.xenit.contentcloud.opa.client.api; import java.util.HashMap; import java.util.List; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/CompileComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java similarity index 72% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/CompileComponent.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java index c1d32f0..25ad42c 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/CompileComponent.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.impl; +package eu.xenit.contentcloud.opa.client.impl; -import eu.xenit.contentcloud.thunx.opa.client.api.CompileApi; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; +import eu.xenit.contentcloud.opa.client.api.CompileApi; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; import java.util.concurrent.CompletableFuture; import lombok.RequiredArgsConstructor; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/DataComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/DataComponent.java similarity index 79% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/DataComponent.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/DataComponent.java index 3dc80e9..938fd5b 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/DataComponent.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/DataComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.impl; +package eu.xenit.contentcloud.opa.client.impl; -import eu.xenit.contentcloud.thunx.opa.client.api.DataApi; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; +import eu.xenit.contentcloud.opa.client.api.DataApi; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; import java.util.concurrent.CompletableFuture; import lombok.RequiredArgsConstructor; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/PolicyComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/PolicyComponent.java similarity index 81% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/PolicyComponent.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/PolicyComponent.java index 3190a0f..ea3fb11 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/PolicyComponent.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/PolicyComponent.java @@ -1,8 +1,8 @@ -package eu.xenit.contentcloud.thunx.opa.client.impl; +package eu.xenit.contentcloud.opa.client.impl; -import eu.xenit.contentcloud.thunx.opa.client.api.PolicyApi; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.MediaType; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import eu.xenit.contentcloud.opa.client.api.PolicyApi; +import eu.xenit.contentcloud.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/thunx/opa/client/impl/QueryComponent.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/QueryComponent.java similarity index 82% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/QueryComponent.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/QueryComponent.java index 22ee819..1b64610 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/impl/QueryComponent.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/QueryComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.impl; +package eu.xenit.contentcloud.opa.client.impl; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; -import eu.xenit.contentcloud.thunx.opa.client.api.QueryApi; +import eu.xenit.contentcloud.opa.client.api.QueryApi; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; import java.util.concurrent.CompletableFuture; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/OpaHttpClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/OpaHttpClient.java similarity index 93% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/OpaHttpClient.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/OpaHttpClient.java index 338fe45..8ca84ed 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/OpaHttpClient.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/OpaHttpClient.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest; +package eu.xenit.contentcloud.opa.client.rest; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpRequestHeaders; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/RestClientConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/RestClientConfiguration.java similarity index 96% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/RestClientConfiguration.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/RestClientConfiguration.java index f1cd5b8..99a91fb 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/RestClientConfiguration.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/RestClientConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest; +package eu.xenit.contentcloud.opa.client.rest; import java.util.function.Consumer; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultOpaHttpClient.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java similarity index 85% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultOpaHttpClient.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java index 189687a..8bc0053 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultOpaHttpClient.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java @@ -1,17 +1,17 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.opa.client.rest.client.jdk; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.ConverterProcessor; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.JacksonBodyConverter; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.StringConverter; -import eu.xenit.contentcloud.thunx.opa.client.rest.OpaHttpClient; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpMethod; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpRequestHeaders; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpStatusException; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.MediaType; -import eu.xenit.contentcloud.thunx.opa.client.rest.RestClientConfiguration; +import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration; +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.ConverterProcessor; +import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.JacksonBodyConverter; +import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.StringConverter; +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 java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java similarity index 91% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java index 1ddd9ef..c32d53b 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.RequestLoggerConfiguration.LogDetail; -import eu.xenit.contentcloud.thunx.opa.client.rest.RestClientConfiguration; +import eu.xenit.contentcloud.opa.client.rest.RestClientConfiguration; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/HttpEntity.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpEntity.java similarity index 78% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/HttpEntity.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpEntity.java index a7d3ccc..96967d4 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/HttpEntity.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpEntity.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpRequestHeaders; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/HttpHeadersBuilder.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpHeadersBuilder.java similarity index 90% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/HttpHeadersBuilder.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpHeadersBuilder.java index f8680d4..99f60db 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/HttpHeadersBuilder.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpHeadersBuilder.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpRequestHeaders; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/RequestLogger.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLogger.java similarity index 98% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/RequestLogger.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLogger.java index 2d59262..ca89c3e 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/RequestLogger.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLogger.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/RequestLoggerConfiguration.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLoggerConfiguration.java similarity index 96% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/RequestLoggerConfiguration.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLoggerConfiguration.java index 8cd5356..fe2d244 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/RequestLoggerConfiguration.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLoggerConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk; +package eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/converter/ConverterProcessor.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/ConverterProcessor.java similarity index 85% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/ConverterProcessor.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/ConverterProcessor.java index be70725..895a9e6 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/ConverterProcessor.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/ConverterProcessor.java @@ -1,8 +1,8 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter; +package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.HttpEntity; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext; -import eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext; +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.HttpEntity; 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/thunx/opa/client/rest/client/jdk/converter/HttpBodyConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/HttpBodyConverter.java similarity index 92% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/HttpBodyConverter.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/HttpBodyConverter.java index 05f0eee..0d2ffff 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/HttpBodyConverter.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/HttpBodyConverter.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter; +package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpRequestHeaders; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.MediaType; +import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java similarity index 95% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java index 05c2d64..1bd79dc 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java @@ -1,10 +1,10 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter; +package eu.xenit.contentcloud.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.thunx.opa.client.rest.http.MediaType; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/client/jdk/converter/StringConverter.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java similarity index 94% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/StringConverter.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java index 887d952..d7ff327 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/client/jdk/converter/StringConverter.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.client.jdk.converter; +package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.MediaType; +import eu.xenit.contentcloud.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/thunx/opa/client/rest/http/HttpMethod.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpMethod.java similarity index 60% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpMethod.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpMethod.java index 3b44826..8498a23 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpMethod.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpMethod.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.http; +package eu.xenit.contentcloud.opa.client.rest.http; public enum HttpMethod { diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpRequestHeaders.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java similarity index 98% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpRequestHeaders.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java index b036620..ac9d3fb 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpRequestHeaders.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.http; +package eu.xenit.contentcloud.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/thunx/opa/client/rest/http/HttpStatusException.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpStatusException.java similarity index 84% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpStatusException.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpStatusException.java index c414d0d..afe83e2 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/HttpStatusException.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpStatusException.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.http; +package eu.xenit.contentcloud.opa.client.rest.http; import lombok.Getter; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/MediaType.java b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java similarity index 99% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/MediaType.java rename to opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java index e1732e5..427a47a 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/thunx/opa/client/rest/http/MediaType.java +++ b/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.client.rest.http; +package eu.xenit.contentcloud.opa.client.rest.http; import java.nio.charset.Charset; import java.util.Arrays; diff --git a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/thunx/opa/client/OpaClientIntegrationTests.java b/opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/OpaClientIntegrationTests.java similarity index 95% rename from opa-async-java-client/src/test/java/eu/xenit/contentcloud/thunx/opa/client/OpaClientIntegrationTests.java rename to opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/OpaClientIntegrationTests.java index ce0daf1..378560b 100644 --- a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/thunx/opa/client/OpaClientIntegrationTests.java +++ b/opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/OpaClientIntegrationTests.java @@ -1,19 +1,19 @@ -package eu.xenit.contentcloud.thunx.opa.client; +package eu.xenit.contentcloud.opa.client; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.InstanceOfAssertFactories.MAP; -import eu.xenit.contentcloud.thunx.opa.client.rest.http.HttpStatusException; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Expression; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Query; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Ref; -import eu.xenit.contentcloud.thunx.opa.client.api.CompileApi; -import eu.xenit.contentcloud.thunx.opa.client.api.CompileApi.PartialEvaluationRequest; -import eu.xenit.contentcloud.thunx.opa.client.api.DataApi; -import eu.xenit.contentcloud.thunx.opa.client.api.DataApi.GetDataResponse; -import eu.xenit.contentcloud.thunx.opa.client.api.PolicyApi.ListPoliciesResponse; +import eu.xenit.contentcloud.opa.client.rest.http.HttpStatusException; +import eu.xenit.contentcloud.opa.rego.ast.Expression; +import eu.xenit.contentcloud.opa.rego.ast.Query; +import eu.xenit.contentcloud.opa.rego.ast.Term; +import eu.xenit.contentcloud.opa.rego.ast.Term.Ref; +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.GetDataResponse; +import eu.xenit.contentcloud.opa.client.api.PolicyApi.ListPoliciesResponse; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/AbstractSyntaxTree.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java similarity index 82% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/AbstractSyntaxTree.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java index f444d37..c7636f0 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/AbstractSyntaxTree.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Expression.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java similarity index 90% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Expression.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java index 91323f4..406caf4 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Expression.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import java.util.List; import lombok.AllArgsConstructor; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Node.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java similarity index 57% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Node.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java index b040466..0acfa12 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Node.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; public interface Node { T accept(RegoVisitor visitor); diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Package.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java similarity index 67% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Package.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java index 8b614bd..d5f6fd5 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Package.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import java.util.List; import lombok.Data; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Query.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java similarity index 92% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Query.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java index 15c8f58..1833a08 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Query.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import java.util.ArrayList; import java.util.Collection; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/QuerySet.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java similarity index 91% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/QuerySet.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java index dafb88c..3007141 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/QuerySet.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import java.util.ArrayList; import java.util.List; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/RegoVisitor.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/RegoVisitor.java new file mode 100644 index 0000000..d9c26c3 --- /dev/null +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/RegoVisitor.java @@ -0,0 +1,27 @@ +package eu.xenit.contentcloud.opa.rego.ast; + +import eu.xenit.contentcloud.opa.rego.ast.Term.ArrayTerm; +import eu.xenit.contentcloud.opa.rego.ast.Term.Call; +import eu.xenit.contentcloud.opa.rego.ast.Term.Ref; +import eu.xenit.contentcloud.opa.rego.ast.Term.Bool; +import eu.xenit.contentcloud.opa.rego.ast.Term.Null; +import eu.xenit.contentcloud.opa.rego.ast.Term.Numeric; +import eu.xenit.contentcloud.opa.rego.ast.Term.Text; +import eu.xenit.contentcloud.opa.rego.ast.Term.Var; + +public interface RegoVisitor { + T visit(QuerySet queries); + T visit(Query query); + T visit(Expression expression); + T visit(Ref ref); + + T visit(Call call); + T visit(Var var); + T visit(Numeric numberValue); + T visit(Text stringValue); + T visit(Bool booleanValue); + T visit(Null nullValue); + + + T visit(ArrayTerm arrayTerm); +} diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Rule.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Rule.java similarity index 91% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Rule.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Rule.java index 62d8d80..3669073 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Rule.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Rule.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import com.fasterxml.jackson.annotation.JsonAnySetter; import java.util.LinkedHashMap; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Term.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java similarity index 92% rename from rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Term.java rename to rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java index 0cc2959..86ab8d3 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/Term.java +++ b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java @@ -1,13 +1,13 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; +package eu.xenit.contentcloud.opa.rego.ast; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.ArrayTerm; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Bool; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Null; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Numeric; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Text; +import eu.xenit.contentcloud.opa.rego.ast.Term.ArrayTerm; +import eu.xenit.contentcloud.opa.rego.ast.Term.Bool; +import eu.xenit.contentcloud.opa.rego.ast.Term.Null; +import eu.xenit.contentcloud.opa.rego.ast.Term.Numeric; +import eu.xenit.contentcloud.opa.rego.ast.Term.Text; import java.math.BigDecimal; import java.util.List; import java.util.Locale; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/RegoVisitor.java b/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/RegoVisitor.java deleted file mode 100644 index fbef90b..0000000 --- a/rego-java/src/main/java/eu/xenit/contentcloud/thunx/opa/rego/ast/RegoVisitor.java +++ /dev/null @@ -1,27 +0,0 @@ -package eu.xenit.contentcloud.thunx.opa.rego.ast; - -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.ArrayTerm; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Call; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Ref; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Bool; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Null; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Numeric; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Text; -import eu.xenit.contentcloud.thunx.opa.rego.ast.Term.Var; - -public interface RegoVisitor { - T visit(QuerySet queries); - T visit(Query query); - T visit(Expression expression); - T visit(Ref ref); - - T visit(Call call); - T visit(Var var); - T visit(Numeric numberValue); - T visit(Text stringValue); - T visit(Bool booleanValue); - T visit(Null nullValue); - - - T visit(ArrayTerm arrayTerm); -}