Skip to content

Commit

Permalink
Change project packagename/group to eu.xenit.contentcloud
Browse files Browse the repository at this point in the history
  • Loading branch information
tgeens committed Jul 20, 2021
1 parent 63aa8a3 commit 2f96af3
Show file tree
Hide file tree
Showing 40 changed files with 126 additions and 126 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<dependency>
<groupId>eu.xenit.contentcloud.thunx</groupId>
<groupId>eu.xenit.contentcloud</groupId>
<artifactId>opa-async-java-client</artifactId>
<version>${version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group=eu.xenit.contentcloud.thunx
group=eu.xenit.contentcloud

lombokVersion=1.18.16
slf4jVersion =1.7.30
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.xenit.contentcloud.thunx.opa.client;
package eu.xenit.contentcloud.opa.client;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.xenit.contentcloud.thunx.opa.client.rest;
package eu.xenit.contentcloud.opa.client.rest;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.xenit.contentcloud.thunx.opa.client.rest.http;
package eu.xenit.contentcloud.opa.client.rest.http;

public enum HttpMethod {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.xenit.contentcloud.thunx.opa.client.rest.http;
package eu.xenit.contentcloud.opa.client.rest.http;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.xenit.contentcloud.thunx.opa.rego.ast;
package eu.xenit.contentcloud.opa.rego.ast;

public interface Node {
<T> T accept(RegoVisitor<T> visitor);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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> {
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);
}
Loading

0 comments on commit 2f96af3

Please sign in to comment.