Rename main components

Author: tgeens

…d/abac/opa/client/ReactiveOpaClient.java …tentcloud/abac/opa/client/OpaClient.javaopa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/ReactiveOpaClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/OpaClient.java opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/ReactiveOpaClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/OpaClient.java

@@ -7,30 +7,30 @@
 import eu.xenit.contentcloud.abac.opa.client.api.PolicyApi;
 import eu.xenit.contentcloud.abac.opa.client.impl.DataComponent;
 import eu.xenit.contentcloud.abac.opa.client.impl.CompileComponent;
-import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaHttpClient;
 import eu.xenit.contentcloud.abac.opa.client.rest.RestClientConfiguration.LogSpecification;
-import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.DefaultOpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.DefaultOpaHttpClient;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Redirect;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
 
-public class ReactiveOpaClient implements PolicyApi, DataApi, CompileApi {
+public class OpaClient implements PolicyApi, DataApi, CompileApi {
 
     private final CompileApi compileApi;
     private final DataApi dataApi;
     private final PolicyApi policyApi;
 
-    ReactiveOpaClient(PolicyApi policyApi, DataApi dataApi, CompileApi compileApi) {
+    OpaClient(PolicyApi policyApi, DataApi dataApi, CompileApi compileApi) {
         this.policyApi = policyApi;
         this.dataApi = dataApi;
         this.compileApi = compileApi;
     }
 
     /**
-     * @return builder for {@link ReactiveOpaClient}
+     * @return builder for {@link OpaClient}
      */
     public static Builder builder() {
         return new Builder();
@@ -73,13 +73,22 @@ public <TData> CompletableFuture<TData> getData(String path, Class<TData> respon
 
 
     /**
-     * Builder for {@link ReactiveOpaClient}
+     * Builder for {@link OpaClient}
      */
     @Slf4j
     public static class Builder {
 
+        /**
+         * The default url
+         */
         private String url = "http://localhost:8181";
-        private OpaRestClient restClient = null;
+
+        /**
+         * The default rest-client
+         */
+        private OpaHttpClient restClient = new DefaultOpaHttpClient(
+                HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).followRedirects(Redirect.NORMAL).build(),
+                new ObjectMapper());
 
         /**
          * @param url URL including protocol and port
@@ -90,40 +99,30 @@ public Builder url(String url) {
             return this;
         }
 
-        public Builder restClient(OpaRestClient restClient) {
+        public Builder restClient(OpaHttpClient restClient) {
             Objects.requireNonNull(restClient);
             this.restClient = restClient;
             return this;
         }
 
-        public ReactiveOpaClient build() {
+        public OpaClient build() {
 
             var opaRestClient = this.getOrCreateDefaultRestClient();
 
-            
-            return new ReactiveOpaClient(
+            return new OpaClient(
                     new PolicyComponent(opaRestClient),
                     new DataComponent(opaRestClient),
                     new CompileComponent(opaRestClient));
 
         }
 
-        private OpaRestClient getOrCreateDefaultRestClient() {
+        private OpaHttpClient getOrCreateDefaultRestClient() {
             var client = this.restClient;
 
-            // create the default client, if not provided by the builder
-            if (client == null) {
-                var httpClient = HttpClient.newBuilder()
-                        .connectTimeout(Duration.ofSeconds(5))
-                        .followRedirects(Redirect.NORMAL)
-                        .build();
-                client = new DefaultOpaRestClient(httpClient, new ObjectMapper());
-            }
-
             // configure the provided client
             client.configure(config -> config
                     .baseUrl(this.url)
-                    .logging(LogSpecification::all));
+                    .logging(LogSpecification::verbose));
 
             return client;
         }

opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/CompileComponent.java

@@ -1,7 +1,7 @@
 package eu.xenit.contentcloud.abac.opa.client.impl;
 
 import eu.xenit.contentcloud.abac.opa.client.api.CompileApi;
-import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaHttpClient;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 
@@ -10,7 +10,7 @@ public class CompileComponent implements CompileApi {
 
     private static final String COMPILE_ENDPOINT = "/v1/compile";
 
-    private final OpaRestClient restClient;
+    private final OpaHttpClient restClient;
 
     @Override
     public CompletableFuture<PartialEvalResponse> compile(PartialEvaluationRequest request) {

opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/DataComponent.java

@@ -1,7 +1,7 @@
 package eu.xenit.contentcloud.abac.opa.client.impl;
 
 import eu.xenit.contentcloud.abac.opa.client.api.DataApi;
-import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaHttpClient;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 
@@ -10,16 +10,16 @@ public class DataComponent implements DataApi {
 
     private static final String DATA_ENDPOINT = "/v1/data/";
 
-    private final OpaRestClient opaRestClient;
+    private final OpaHttpClient opaHttpClient;
 
     @Override
     public <TData> CompletableFuture<Void> upsertData(String path, TData data) {
-        return opaRestClient.put(DATA_ENDPOINT + path, data);
+        return opaHttpClient.put(DATA_ENDPOINT + path, data);
     }
 
     @Override
     public <TData> CompletableFuture<TData> getData(String path, Class<TData> responseType) {
-        return opaRestClient.get(DATA_ENDPOINT + path, responseType);
+        return opaHttpClient.get(DATA_ENDPOINT + path, responseType);
     }
 
 

opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/impl/PolicyComponent.java

@@ -1,7 +1,7 @@
 package eu.xenit.contentcloud.abac.opa.client.impl;
 
 import eu.xenit.contentcloud.abac.opa.client.api.PolicyApi;
-import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaHttpClient;
 import eu.xenit.contentcloud.abac.opa.client.rest.http.MediaType;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +11,7 @@ public class PolicyComponent implements PolicyApi {
 
     private static final String POLICY_ENDPOINT = "/v1/policies";
 
-    private final OpaRestClient restClient;
+    private final OpaHttpClient restClient;
 
     @Override
     public CompletableFuture<ListPoliciesResponse> listPolicies() {

…/abac/opa/client/rest/OpaRestClient.java …/abac/opa/client/rest/OpaHttpClient.javaopa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaRestClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaHttpClient.java opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaRestClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/OpaHttpClient.java

@@ -4,7 +4,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
-public interface OpaRestClient {
+public interface OpaHttpClient {
 
     <TResponse> CompletableFuture<TResponse> get(String path,
             Consumer<HttpRequestHeaders> headersCallback, Class<TResponse> responseType);
@@ -44,6 +44,4 @@ default <TResponse> CompletableFuture<TResponse> delete(String path, Class<TResp
 
     void configure(Consumer<RestClientConfiguration> callback);
 
-
-
 }

…est/client/jdk/DefaultOpaRestClient.java …est/client/jdk/DefaultOpaHttpClient.javaopa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaRestClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaHttpClient.java opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaRestClient.java renamed to opa-async-java-client/src/main/java/eu/xenit/contentcloud/abac/opa/client/rest/client/jdk/DefaultOpaHttpClient.java

@@ -1,7 +1,7 @@
 package eu.xenit.contentcloud.abac.opa.client.rest.client.jdk;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.xenit.contentcloud.abac.opa.client.rest.OpaRestClient;
+import eu.xenit.contentcloud.abac.opa.client.rest.OpaHttpClient;
 import eu.xenit.contentcloud.abac.opa.client.rest.client.jdk.converter.JacksonBodyConverter;
 import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpMethod;
 import eu.xenit.contentcloud.abac.opa.client.rest.http.HttpRequestHeaders;
@@ -24,7 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class DefaultOpaRestClient implements OpaRestClient {
+public class DefaultOpaHttpClient implements OpaHttpClient {
 
     private final HttpClient httpClient;
     private final ObjectMapper objectMapper;
@@ -40,7 +40,7 @@ public class DefaultOpaRestClient implements OpaRestClient {
     private static final String HEADER_ACCEPT = "Accept";
     private static final String HEADER_CONTENT_TYPE = "Content-Type";
 
-    public DefaultOpaRestClient(HttpClient httpClient, ObjectMapper objectMapper) {
+    public DefaultOpaHttpClient(HttpClient httpClient, ObjectMapper objectMapper) {
         this.httpClient = httpClient;
         this.objectMapper = objectMapper;
 

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

@@ -42,7 +42,7 @@ class OpaClientIntegrationTests {
             .withExposedPorts(OPA_EXPOSED_PORT)
             .waitingFor(Wait.forHttp("/"));
 
-    private final ReactiveOpaClient opaClient = ReactiveOpaClient.builder()
+    private final OpaClient opaClient = OpaClient.builder()
             .url("http://" + opaContainer.getHost() + ":" + opaContainer.getMappedPort(OPA_EXPOSED_PORT))
             .build();