diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2514b..cffc0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 0.4.0 - (Unreleased) +## 0.4.0 - 2022-10-04 Changed: +* [#8] - Moved packages to `com.contentgrid.opa` * [#7] - Moved maven group coordinates to `com.contentgrid.opa-java-client` Housekeeping: @@ -15,7 +16,8 @@ Housekeeping: * [#6] - Updated dependencies to Spring Boot 2.6.12 baseline [#6]: https://github.com/xenit-eu/opa-java-client/pull/6 -[#7]: https://github.com/xenit-eu/opa-java-client/pull/7/files +[#7]: https://github.com/xenit-eu/opa-java-client/pull/7 + ## 0.3.0 - 2021-12-09 Fixed: diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaClient.java similarity index 86% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaClient.java index a56c7df..5842b90 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaClient.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaClient.java @@ -1,19 +1,19 @@ -package eu.xenit.contentcloud.opa.client; - +package com.contentgrid.opa.client; + +import com.contentgrid.opa.client.api.CompileApi; +import com.contentgrid.opa.client.api.DataApi; +import com.contentgrid.opa.client.api.QueryApi; +import com.contentgrid.opa.client.impl.CompileComponent; +import com.contentgrid.opa.client.impl.DataComponent; +import com.contentgrid.opa.client.impl.PolicyComponent; +import com.contentgrid.opa.client.impl.QueryComponent; +import com.contentgrid.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.rest.RestClientConfiguration.LogSpecification; +import com.contentgrid.opa.client.rest.client.jdk.DefaultOpaHttpClient; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -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.api.QueryApi; -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 com.contentgrid.opa.client.api.PolicyApi; 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/opa/client/OpaConfiguration.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaConfiguration.java similarity index 79% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaConfiguration.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaConfiguration.java index 9d69f7c..c124630 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/OpaConfiguration.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/OpaConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client; +package com.contentgrid.opa.client; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/CompileApi.java similarity index 93% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/CompileApi.java index 196626e..d59a9a3 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/CompileApi.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/CompileApi.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.api; +package com.contentgrid.opa.client.api; import com.fasterxml.jackson.annotation.JsonAnySetter; -import eu.xenit.contentcloud.opa.rego.ast.QuerySet; +import com.contentgrid.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/opa/client/api/DataApi.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/DataApi.java similarity index 90% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/DataApi.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/DataApi.java index 10d6be9..7b5c17b 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/DataApi.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/DataApi.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.api; +package com.contentgrid.opa.client.api; import java.util.concurrent.CompletableFuture; import lombok.Data; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/PolicyApi.java similarity index 88% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/PolicyApi.java index 6cdf895..43e759a 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/PolicyApi.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/PolicyApi.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.opa.client.api; +package com.contentgrid.opa.client.api; -import eu.xenit.contentcloud.opa.rego.ast.AbstractSyntaxTree; +import com.contentgrid.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/opa/client/api/QueryApi.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/QueryApi.java similarity index 90% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/QueryApi.java index 22e8638..07bcc15 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/api/QueryApi.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/api/QueryApi.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.api; +package com.contentgrid.opa.client.api; import java.util.HashMap; import java.util.List; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/CompileComponent.java similarity index 74% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/CompileComponent.java index 25ad42c..1e1dab2 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/CompileComponent.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/CompileComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.impl; +package com.contentgrid.opa.client.impl; -import eu.xenit.contentcloud.opa.client.api.CompileApi; -import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.api.CompileApi; +import com.contentgrid.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/opa/client/impl/DataComponent.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/DataComponent.java similarity index 80% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/DataComponent.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/DataComponent.java index 938fd5b..13e86b3 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/DataComponent.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/DataComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.impl; +package com.contentgrid.opa.client.impl; -import eu.xenit.contentcloud.opa.client.api.DataApi; -import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.api.DataApi; +import com.contentgrid.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/opa/client/impl/PolicyComponent.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/PolicyComponent.java similarity index 83% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/PolicyComponent.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/PolicyComponent.java index ea3fb11..eba4df0 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/PolicyComponent.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/PolicyComponent.java @@ -1,8 +1,8 @@ -package eu.xenit.contentcloud.opa.client.impl; +package com.contentgrid.opa.client.impl; -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 com.contentgrid.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.api.PolicyApi; +import com.contentgrid.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/opa/client/impl/QueryComponent.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/QueryComponent.java similarity index 83% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/QueryComponent.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/QueryComponent.java index 1b64610..047dfc5 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/impl/QueryComponent.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/impl/QueryComponent.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.impl; +package com.contentgrid.opa.client.impl; -import eu.xenit.contentcloud.opa.client.api.QueryApi; -import eu.xenit.contentcloud.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.api.QueryApi; +import com.contentgrid.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/opa/client/rest/OpaHttpClient.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/OpaHttpClient.java similarity index 93% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/OpaHttpClient.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/OpaHttpClient.java index 8ca84ed..78ad8b2 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/OpaHttpClient.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/OpaHttpClient.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.opa.client.rest; +package com.contentgrid.opa.client.rest; -import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders; +import com.contentgrid.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/opa/client/rest/RestClientConfiguration.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/RestClientConfiguration.java similarity index 96% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/RestClientConfiguration.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/RestClientConfiguration.java index 99a91fb..0748b00 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/RestClientConfiguration.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/RestClientConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest; +package com.contentgrid.opa.client.rest; import java.util.function.Consumer; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClient.java similarity index 86% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClient.java index 4ffb802..9a4bc64 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClient.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClient.java @@ -1,17 +1,17 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; - +package com.contentgrid.opa.client.rest.client.jdk; + +import com.contentgrid.opa.client.rest.OpaHttpClient; +import com.contentgrid.opa.client.rest.client.jdk.converter.ConverterProcessor; +import com.contentgrid.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext; +import com.contentgrid.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext; +import com.contentgrid.opa.client.rest.client.jdk.converter.JacksonBodyConverter; +import com.contentgrid.opa.client.rest.client.jdk.converter.StringConverter; +import com.contentgrid.opa.client.rest.http.HttpRequestHeaders; +import com.contentgrid.opa.client.rest.http.HttpStatusException; +import com.contentgrid.opa.client.rest.http.MediaType; import com.fasterxml.jackson.databind.ObjectMapper; -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.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.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 com.contentgrid.opa.client.rest.RestClientConfiguration; +import com.contentgrid.opa.client.rest.http.HttpMethod; 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/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java similarity index 92% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java index c32d53b..f05d51d 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/DefaultRestClientConfiguration.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.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 com.contentgrid.opa.client.rest.RestClientConfiguration; +import com.contentgrid.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/opa/client/rest/client/jdk/HttpEntity.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpEntity.java similarity index 80% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpEntity.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpEntity.java index 96967d4..e41ad8c 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpEntity.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpEntity.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders; +import com.contentgrid.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/opa/client/rest/client/jdk/HttpHeadersBuilder.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpHeadersBuilder.java similarity index 90% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpHeadersBuilder.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpHeadersBuilder.java index 99f60db..2ab8a55 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/HttpHeadersBuilder.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/HttpHeadersBuilder.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.opa.client.rest.http.HttpRequestHeaders; +import com.contentgrid.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/opa/client/rest/client/jdk/RequestLogger.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLogger.java similarity index 98% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLogger.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLogger.java index ca89c3e..cdaada8 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLogger.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLogger.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.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/opa/client/rest/client/jdk/RequestLoggerConfiguration.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLoggerConfiguration.java similarity index 96% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLoggerConfiguration.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLoggerConfiguration.java index fe2d244..0f10204 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/RequestLoggerConfiguration.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/RequestLoggerConfiguration.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.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/opa/client/rest/client/jdk/converter/ConverterProcessor.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/ConverterProcessor.java similarity index 86% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/ConverterProcessor.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/ConverterProcessor.java index 895a9e6..d46caea 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/ConverterProcessor.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/ConverterProcessor.java @@ -1,8 +1,8 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; +package com.contentgrid.opa.client.rest.client.jdk.converter; -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 com.contentgrid.opa.client.rest.client.jdk.converter.HttpBodyConverter.DeserializationContext; +import com.contentgrid.opa.client.rest.client.jdk.converter.HttpBodyConverter.SerializationContext; +import com.contentgrid.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/opa/client/rest/client/jdk/converter/HttpBodyConverter.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/HttpBodyConverter.java similarity index 93% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/HttpBodyConverter.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/HttpBodyConverter.java index 0d2ffff..8a4855c 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/HttpBodyConverter.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/HttpBodyConverter.java @@ -1,7 +1,7 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; +package com.contentgrid.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 com.contentgrid.opa.client.rest.http.HttpRequestHeaders; +import com.contentgrid.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/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java similarity index 95% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java index 1bd79dc..45a7895 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/JacksonBodyConverter.java @@ -1,10 +1,10 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; +package com.contentgrid.opa.client.rest.client.jdk.converter; +import com.contentgrid.opa.client.rest.http.MediaType; 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 java.io.IOException; import java.io.UncheckedIOException; import java.util.Collection; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/StringConverter.java similarity index 94% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/StringConverter.java index d7ff327..f6a6a5f 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/converter/StringConverter.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/client/jdk/converter/StringConverter.java @@ -1,6 +1,6 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk.converter; +package com.contentgrid.opa.client.rest.client.jdk.converter; -import eu.xenit.contentcloud.opa.client.rest.http.MediaType; +import com.contentgrid.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/opa/client/rest/http/HttpMethod.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpMethod.java similarity index 62% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpMethod.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpMethod.java index 8498a23..93fec8b 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpMethod.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpMethod.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.http; +package com.contentgrid.opa.client.rest.http; public enum HttpMethod { diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpRequestHeaders.java similarity index 98% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpRequestHeaders.java index ac9d3fb..49bac8a 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpRequestHeaders.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpRequestHeaders.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.http; +package com.contentgrid.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/opa/client/rest/http/HttpStatusException.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpStatusException.java similarity index 86% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpStatusException.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpStatusException.java index afe83e2..45c9273 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/HttpStatusException.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/HttpStatusException.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.http; +package com.contentgrid.opa.client.rest.http; import lombok.Getter; diff --git a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/MediaType.java similarity index 99% rename from opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java rename to opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/MediaType.java index 427a47a..a144f31 100644 --- a/opa-async-java-client/src/main/java/eu/xenit/contentcloud/opa/client/rest/http/MediaType.java +++ b/opa-async-java-client/src/main/java/com/contentgrid/opa/client/rest/http/MediaType.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.client.rest.http; +package com.contentgrid.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/opa/client/OpaClientIntegrationTests.java b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java similarity index 96% rename from opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/OpaClientIntegrationTests.java rename to opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java index 378560b..01845a7 100644 --- a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/OpaClientIntegrationTests.java +++ b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java @@ -1,19 +1,19 @@ -package eu.xenit.contentcloud.opa.client; +package com.contentgrid.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.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 com.contentgrid.opa.client.api.CompileApi; +import com.contentgrid.opa.client.api.CompileApi.PartialEvaluationRequest; +import com.contentgrid.opa.rego.ast.Query; +import com.contentgrid.opa.client.rest.http.HttpStatusException; +import com.contentgrid.opa.rego.ast.Expression; +import com.contentgrid.opa.rego.ast.Term; +import com.contentgrid.opa.rego.ast.Term.Ref; +import com.contentgrid.opa.client.api.DataApi; +import com.contentgrid.opa.client.api.DataApi.GetDataResponse; +import com.contentgrid.opa.client.api.PolicyApi.ListPoliciesResponse; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; diff --git a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java similarity index 72% rename from opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java rename to opa-async-java-client/src/test/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java index 677a2b8..6788d80 100644 --- a/opa-async-java-client/src/test/java/eu/xenit/contentcloud/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java +++ b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/rest/client/jdk/DefaultOpaHttpClientTest.java @@ -1,8 +1,8 @@ -package eu.xenit.contentcloud.opa.client.rest.client.jdk; +package com.contentgrid.opa.client.rest.client.jdk; -import eu.xenit.contentcloud.opa.client.OpaClient; -import eu.xenit.contentcloud.opa.client.rest.client.jdk.converter.HttpBodyConverter; -import eu.xenit.contentcloud.opa.client.rest.http.MediaType; +import com.contentgrid.opa.client.rest.client.jdk.converter.HttpBodyConverter; +import com.contentgrid.opa.client.rest.http.MediaType; +import com.contentgrid.opa.client.OpaClient; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/AbstractSyntaxTree.java similarity index 84% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/AbstractSyntaxTree.java index c7636f0..de2431d 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/AbstractSyntaxTree.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/AbstractSyntaxTree.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Expression.java similarity index 91% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Expression.java index 406caf4..d76c69a 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Expression.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Expression.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import java.util.List; import lombok.AllArgsConstructor; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Node.java similarity index 61% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Node.java index 0acfa12..f99455c 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Node.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Node.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; public interface Node { T accept(RegoVisitor visitor); diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Package.java similarity index 70% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Package.java index d5f6fd5..1eb1c8a 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Package.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Package.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import java.util.List; import lombok.Data; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Query.java similarity index 93% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Query.java index 1833a08..1e58393 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Query.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Query.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import java.util.ArrayList; import java.util.Collection; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/QuerySet.java similarity index 92% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/QuerySet.java index 3007141..b112ca1 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/QuerySet.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/QuerySet.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import java.util.ArrayList; import java.util.List; diff --git a/rego-java/src/main/java/com/contentgrid/opa/rego/ast/RegoVisitor.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/RegoVisitor.java new file mode 100644 index 0000000..42bb41b --- /dev/null +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/RegoVisitor.java @@ -0,0 +1,27 @@ +package com.contentgrid.opa.rego.ast; + +import com.contentgrid.opa.rego.ast.Term.ArrayTerm; +import com.contentgrid.opa.rego.ast.Term.Call; +import com.contentgrid.opa.rego.ast.Term.Ref; +import com.contentgrid.opa.rego.ast.Term.Bool; +import com.contentgrid.opa.rego.ast.Term.Null; +import com.contentgrid.opa.rego.ast.Term.Numeric; +import com.contentgrid.opa.rego.ast.Term.Text; +import com.contentgrid.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/opa/rego/ast/Rule.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Rule.java similarity index 92% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Rule.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Rule.java index 3669073..1052341 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Rule.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Rule.java @@ -1,4 +1,4 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.opa.rego.ast; import com.fasterxml.jackson.annotation.JsonAnySetter; import java.util.LinkedHashMap; diff --git a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Term.java similarity index 93% rename from rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java rename to rego-java/src/main/java/com/contentgrid/opa/rego/ast/Term.java index 86ab8d3..5400d40 100644 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/Term.java +++ b/rego-java/src/main/java/com/contentgrid/opa/rego/ast/Term.java @@ -1,13 +1,13 @@ -package eu.xenit.contentcloud.opa.rego.ast; +package com.contentgrid.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.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 com.contentgrid.opa.rego.ast.Term.ArrayTerm; +import com.contentgrid.opa.rego.ast.Term.Bool; +import com.contentgrid.opa.rego.ast.Term.Null; +import com.contentgrid.opa.rego.ast.Term.Numeric; +import com.contentgrid.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/opa/rego/ast/RegoVisitor.java b/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/RegoVisitor.java deleted file mode 100644 index d9c26c3..0000000 --- a/rego-java/src/main/java/eu/xenit/contentcloud/opa/rego/ast/RegoVisitor.java +++ /dev/null @@ -1,27 +0,0 @@ -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); -}