#33 - Add support for using avaje-jsonb to serialise to/from json content

Author: rbygrave

client/pom.xml

@@ -31,6 +31,13 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jsonb</artifactId>
+      <version>0.5</version>
+      <optional>true</optional>
+    </dependency>
+
     <!-- test dependencies  -->
 
     <dependency>
@@ -84,6 +91,13 @@
       <scope>test</scope>
     </dependency>
 
+<!--    <dependency>-->
+<!--      <groupId>io.avaje</groupId>-->
+<!--      <artifactId>avaje-jsonb-generator</artifactId>-->
+<!--      <version>0.5</version>-->
+<!--      <scope>test</scope>-->
+<!--    </dependency>-->
+
   </dependencies>
 
   <build>
@@ -94,11 +108,13 @@
         <configuration>
           <argLine>
             --add-modules com.fasterxml.jackson.databind
+            --add-modules io.avaje.jsonb
             --add-opens io.avaje.http.client/io.avaje.http.client=ALL-UNNAMED
             --add-opens io.avaje.http.client/org.example.webserver=ALL-UNNAMED
             --add-opens io.avaje.http.client/org.example.github=ALL-UNNAMED
             --add-opens io.avaje.http.client/org.example.webserver=com.fasterxml.jackson.databind
             --add-opens io.avaje.http.client/org.example.github=com.fasterxml.jackson.databind
+            --add-opens io.avaje.http.client/org.example.github=io.avaje.jsonb
           </argLine>
         </configuration>
       </plugin>

client/src/main/java/io/avaje/http/client/BodyAdapter.java

@@ -14,7 +14,7 @@ public interface BodyAdapter {
    *
    * @param type The type of the bean this writer is for
    */
-  BodyWriter beanWriter(Class<?> type);
+  <T> BodyWriter<T> beanWriter(Class<?> type);
 
   /**
    * Return a BodyReader to read response content and convert to a bean.

client/src/main/java/io/avaje/http/client/BodyWriter.java

@@ -3,22 +3,22 @@
 /**
  * Writes beans as content for a specific content type.
  */
-public interface BodyWriter {
+public interface BodyWriter<T> {
 
   /**
    * Write the bean as content using the default content type.
    * <p>
    * Used when all beans sent via POST, PUT, PATCH will be sent as
    * a single content type like <code>application/json; charset=utf8</code>.
    */
-  BodyContent write(Object bean);
+  BodyContent write(T bean);
 
   /**
    * Write the bean as content with the requested content type.
    * <p>
    * The writer is expected to use the given contentType to determine
    * how to write the bean as content.
    */
-  BodyContent write(Object bean, String contentType);
+  BodyContent write(T bean, String contentType);
 
 }

client/src/main/java/io/avaje/http/client/DHttpClientContext.java

@@ -176,7 +176,7 @@ <T> CompletableFuture<HttpResponse<T>> sendAsync(HttpRequest.Builder requestBuil
     return httpClient.sendAsync(requestBuilder.build(), bodyHandler);
   }
 
-  BodyContent write(Object bean, String contentType) {
+  <T> BodyContent write(T bean, String contentType) {
     return bodyAdapter.beanWriter(bean.getClass()).write(bean, contentType);
   }
 

client/src/main/java/io/avaje/http/client/JacksonBodyAdapter.java

@@ -25,10 +25,8 @@ public class JacksonBodyAdapter implements BodyAdapter {
 
   private final ObjectMapper mapper;
 
-  private final ConcurrentHashMap<Class<?>, BodyWriter> beanWriterCache = new ConcurrentHashMap<>();
-
+  private final ConcurrentHashMap<Class<?>, BodyWriter<?>> beanWriterCache = new ConcurrentHashMap<>();
   private final ConcurrentHashMap<Class<?>, BodyReader<?>> beanReaderCache = new ConcurrentHashMap<>();
-
   private final ConcurrentHashMap<Class<?>, BodyReader<?>> listReaderCache = new ConcurrentHashMap<>();
 
   /**
@@ -49,11 +47,12 @@ public JacksonBodyAdapter() {
       .setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public BodyWriter beanWriter(Class<?> cls) {
-    return beanWriterCache.computeIfAbsent(cls, aClass -> {
+  public <T> BodyWriter<T> beanWriter(Class<?> cls) {
+    return (BodyWriter<T>)beanWriterCache.computeIfAbsent(cls, aClass -> {
       try {
-        return new JWriter(mapper.writerFor(cls));
+        return new JWriter<>(mapper.writerFor(cls));
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
@@ -113,7 +112,7 @@ public T read(BodyContent bodyContent) {
     }
   }
 
-  private static class JWriter implements BodyWriter {
+  private static class JWriter<T> implements BodyWriter<T> {
 
     private final ObjectWriter writer;
 
@@ -122,14 +121,14 @@ public JWriter(ObjectWriter writer) {
     }
 
     @Override
-    public BodyContent write(Object bean, String contentType) {
+    public BodyContent write(T bean, String contentType) {
       // ignoring the requested contentType and always
       // writing the body as json content
       return write(bean);
     }
 
     @Override
-    public BodyContent write(Object bean) {
+    public BodyContent write(T bean) {
       try {
         return BodyContent.asJson(writer.writeValueAsBytes(bean));
       } catch (JsonProcessingException e) {

client/src/main/java/io/avaje/http/client/JsonbBodyAdapter.java

@@ -0,0 +1,100 @@
+package io.avaje.http.client;
+
+import io.avaje.jsonb.JsonType;
+import io.avaje.jsonb.Jsonb;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * avaje jsonb BodyAdapter to read and write beans as JSON.
+ *
+ * <pre>{@code
+ *
+ *   HttpClientContext.newBuilder()
+ *       .baseUrl(baseUrl)
+ *       .bodyAdapter(new JsonbBodyAdapter())
+ *       .build();
+ *
+ * }</pre>
+ */
+public class JsonbBodyAdapter implements BodyAdapter {
+
+  private final Jsonb jsonb;
+  private final ConcurrentHashMap<Class<?>, BodyWriter<?>> beanWriterCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Class<?>, BodyReader<?>> beanReaderCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Class<?>, BodyReader<?>> listReaderCache = new ConcurrentHashMap<>();
+
+  /**
+   * Create passing the Jsonb to use.
+   */
+  public JsonbBodyAdapter(Jsonb jsonb) {
+    this.jsonb = jsonb;
+  }
+
+  /**
+   * Create with a default Jsonb that allows unknown properties.
+   */
+  public JsonbBodyAdapter() {
+    this.jsonb = Jsonb.newBuilder().build();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> BodyWriter<T> beanWriter(Class<?> cls) {
+    return (BodyWriter<T>) beanWriterCache.computeIfAbsent(cls, aClass -> new JWriter<>(jsonb.type(cls)));
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> BodyReader<T> beanReader(Class<T> cls) {
+    return (BodyReader<T>) beanReaderCache.computeIfAbsent(cls, aClass -> new JReader<>(jsonb.type(cls)));
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> BodyReader<List<T>> listReader(Class<T> cls) {
+    return (BodyReader<List<T>>) listReaderCache.computeIfAbsent(cls, aClass -> new JReader<>(jsonb.type(cls).list()));
+  }
+
+  private static class JReader<T> implements BodyReader<T> {
+
+    private final JsonType<T> reader;
+
+    JReader(JsonType<T> reader) {
+      this.reader = reader;
+    }
+
+    @Override
+    public T readBody(String content) {
+      return reader.fromJson(content);
+    }
+
+    @Override
+    public T read(BodyContent bodyContent) {
+      return reader.fromJson(bodyContent.content());
+    }
+  }
+
+  private static class JWriter<T> implements BodyWriter<T> {
+
+    private final JsonType<T> writer;
+
+    public JWriter(JsonType<T> writer) {
+      this.writer = writer;
+    }
+
+    @Override
+    public BodyContent write(T bean, String contentType) {
+      // ignoring the requested contentType and always
+      // writing the body as json content
+      return write(bean);
+    }
+
+    @Override
+    public BodyContent write(T bean) {
+      return BodyContent.asJson(writer.toJsonBytes(bean));
+    }
+  }
+
+}

client/src/main/java/module-info.java

@@ -5,6 +5,7 @@
   requires transitive java.net.http;
   requires transitive org.slf4j;
   requires static com.fasterxml.jackson.databind;
+  requires static io.avaje.jsonb;
 
   exports io.avaje.http.client;
 }

client/src/test/java/io/avaje/http/client/DHttpApiTest.java

@@ -1,8 +1,11 @@
 package io.avaje.http.client;
 
+import io.avaje.jsonb.Jsonb;
 import org.example.github.Repo;
 import org.example.github.Simple;
 import org.example.github.httpclient.Simple$HttpClient;
+import org.example.github.RepoJsonAdapter;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -11,6 +14,7 @@
 
 public class DHttpApiTest {
 
+  @Disabled
   @Test
   void test_github_listRepos() {
 
@@ -27,4 +31,24 @@ void test_github_listRepos() {
     assertThat(repos).isNotEmpty();
   }
 
+  @Test
+  void jsonb_github_listRepos() {
+
+    Jsonb jsonb = Jsonb.newBuilder()
+      .add(Repo.class, RepoJsonAdapter::new)
+      .build();
+
+    final HttpClientContext clientContext = HttpClientContext.newBuilder()
+      .baseUrl("https://api.github.com")
+      .bodyAdapter(new JsonbBodyAdapter(jsonb))
+      .build();
+
+    DHttpApi httpApi = new DHttpApi();
+    httpApi.addProvider(new Simple$HttpClient.Provider());
+    final Simple simple = httpApi.provideFor(Simple.class, clientContext);
+
+    final List<Repo> repos = simple.listRepos("rbygrave", "junk");
+    assertThat(repos).isNotEmpty();
+  }
+
 }

client/src/test/java/org/example/github/GithubTest.java

@@ -2,7 +2,6 @@
 
 import io.avaje.http.client.HttpClientContext;
 import io.avaje.http.client.JacksonBodyAdapter;
-import io.avaje.http.client.RequestLogger;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 

client/src/test/java/org/example/github/Repo.java

@@ -1,5 +1,8 @@
 package org.example.github;
 
+//import io.avaje.jsonb.Json;
+
+//@Json
 public class Repo {
   public long id;
   public String name;