add support for Jsonb generics

Author: SentryMan

client/pom.xml

@@ -39,14 +39,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.0-RC1</version>
+      <version>1.1-RC2</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>8.6</version>
+      <version>8.10</version>
       <optional>true</optional>
     </dependency>
 
@@ -76,14 +76,14 @@
     <dependency>
       <groupId>io.javalin</groupId>
       <artifactId>javalin</artifactId>
-      <version>4.1.1</version>
+      <version>5.2.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.16</version>
+      <version>1.20</version>
       <scope>test</scope>
     </dependency>
 
@@ -125,7 +125,7 @@
                 <path>
                   <groupId>io.avaje</groupId>
                   <artifactId>avaje-inject-generator</artifactId>
-                  <version>8.6</version>
+                  <version>8.10</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>

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

@@ -1,5 +1,6 @@
 package io.avaje.http.client;
 
+import java.lang.reflect.ParameterizedType;
 import java.util.List;
 
 /**
@@ -23,11 +24,29 @@ public interface BodyAdapter {
    */
   <T> BodyReader<T> beanReader(Class<T> type);
 
+  /**
+   * Return a BodyReader to read response content and convert to a bean.
+   *
+   * @param type The bean type to convert the content to.
+   */
+  default <T> BodyReader<T> beanReader(ParameterizedType type) {
+    throw new UnsupportedOperationException("Parameterized types not supported for this adapter");
+  }
+
+
   /**
    * Return a BodyReader to read response content and convert to a list of beans.
    *
    * @param type The bean type to convert the content to.
    */
   <T> BodyReader<List<T>> listReader(Class<T> type);
 
+  /**
+   * Return a BodyReader to read response content and convert to a list of beans.
+   *
+   * @param type The bean type to convert the content to.
+   */
+  default <T> BodyReader<List<T>> listReader(ParameterizedType type) {
+    throw new UnsupportedOperationException("Parameterized types not supported for this adapter");
+  }
 }

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

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.ParameterizedType;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
@@ -273,6 +274,10 @@ <T> BodyReader<T> beanReader(Class<T> cls) {
     return bodyAdapter.beanReader(cls);
   }
 
+  <T> BodyReader<T> beanReader(ParameterizedType cls) {
+    return bodyAdapter.beanReader(cls);
+  }
+
   <T> T readBean(Class<T> cls, BodyContent content) {
     return bodyAdapter.beanReader(cls).read(content);
   }
@@ -281,6 +286,15 @@ <T> List<T> readList(Class<T> cls, BodyContent content) {
     return bodyAdapter.listReader(cls).read(content);
   }
 
+  @SuppressWarnings("unchecked")
+  <T> T readBean(ParameterizedType cls, BodyContent content) {
+    return (T) bodyAdapter.beanReader(cls).read(content);
+  }
+
+  <T> List<T> readList(ParameterizedType cls, BodyContent content) {
+    return (List<T>) bodyAdapter.listReader(cls).read(content);
+  }
+
   void afterResponse(DHttpClientRequest request) {
     metricResTotal.add(1);
     metricResMicros.add(request.responseTimeMicros());

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

@@ -3,6 +3,7 @@
 import javax.net.ssl.SSLSession;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
+import java.lang.reflect.ParameterizedType;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.net.http.HttpClient;
@@ -433,7 +434,7 @@ public <T> List<T> list(Class<T> cls) {
     readResponseContent();
     return context.readList(cls, encodedResponseBody);
   }
-
+  
   @Override
   public <T> Stream<T> stream(Class<T> cls) {
     final HttpResponse<Stream<String>> res = handler(HttpResponse.BodyHandlers.ofLines());
@@ -445,6 +446,31 @@ public <T> Stream<T> stream(Class<T> cls) {
     return res.body().map(bodyReader::readBody);
   }
 
+
+  @Override
+  public <T> T bean(ParameterizedType cls) {
+    readResponseContent();
+    return context.readBean(cls, encodedResponseBody);
+  }
+
+  @Override
+  public <T> List<T> list(ParameterizedType cls) {
+    readResponseContent();
+    return context.readList(cls, encodedResponseBody);
+  }
+
+  
+  @Override
+  public <T> Stream<T> stream(ParameterizedType cls) {
+    final HttpResponse<Stream<String>> res = handler(HttpResponse.BodyHandlers.ofLines());
+    this.httpResponse = res;
+    if (res.statusCode() >= 300) {
+      throw new HttpException(res, context);
+    }
+    final BodyReader<T> bodyReader = context.beanReader(cls);
+    return res.body().map(bodyReader::readBody);
+  }
+
   @Override
   public <T> HttpResponse<T> handler(HttpResponse.BodyHandler<T> responseHandler) {
     final HttpResponse<T> response = sendWith(responseHandler);

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

@@ -1,6 +1,7 @@
 package io.avaje.http.client;
 
 import java.io.InputStream;
+import java.lang.reflect.ParameterizedType;
 import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.util.List;
@@ -85,6 +86,7 @@ public interface HttpClientResponse {
    */
   <T> List<T> list(Class<T> type);
 
+
   /**
    * Return the response as a stream of beans.
    * <p>
@@ -106,6 +108,51 @@ public interface HttpClientResponse {
    */
   <T> Stream<T> stream(Class<T> type);
 
+  /**
+   * Return the response as a single bean.
+   * <p>
+   * If the HTTP statusCode is not in the 2XX range a HttpException is throw which contains
+   * the HttpResponse. This is the cause in the CompletionException.
+   *
+   * @param type The parameterized type of the bean to convert the response content into.
+   * @return The bean the response is converted into.
+   * @throws HttpException when the response has error status codes
+   */
+  <T> T bean(ParameterizedType type);
+
+  /**
+   * Return the response as a list of beans.
+   * <p>
+   * If the HTTP statusCode is not in the 2XX range a HttpException is throw which contains
+   * the HttpResponse. This is the cause in the CompletionException.
+   *
+   * @param type The parameterized type of the bean to convert the response content into.
+   * @return The list of beans the response is converted into.
+   * @throws HttpException when the response has error status codes
+   */
+  <T> List<T> list(ParameterizedType type);
+
+  /**
+   * Return the response as a stream of beans.
+   * <p>
+   * Typically the response is expected to be {@literal application/x-json-stream}
+   * newline delimited json payload.
+   * <p>
+   * Note that for this stream request the response content is not deemed
+   * 'loggable' by avaje-http-client. This is because the entire response
+   * may not be available at the time of the callback. As such {@link RequestLogger}
+   * will not include response content when logging stream request/response
+   * <p>
+   * If the HTTP statusCode is not in the 2XX range a HttpException is throw which contains
+   * the HttpResponse. This is the cause in the CompletionException.
+   *
+   * @param type The parameterized type of the bean to convert the response content into.
+   * @return The stream of beans from the response
+   * @throws HttpException when the response has error status codes
+   */
+  <T> Stream<T> stream(ParameterizedType type);
+
+
   /**
    * Return the response with check for 200 range status code.
    * <p>

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

@@ -1,13 +1,15 @@
 package io.avaje.http.client;
 
-import io.avaje.jsonb.JsonType;
-import io.avaje.jsonb.Jsonb;
-
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.avaje.jsonb.JsonType;
+import io.avaje.jsonb.Jsonb;
+
 /**
- * avaje jsonb BodyAdapter to read and write beans as JSON.
+ * Avaje Jsonb BodyAdapter to read and write beans as JSON.
  *
  * <pre>{@code
  *
@@ -21,9 +23,9 @@
 public final 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<>();
+  private final ConcurrentHashMap<Type, BodyWriter<?>> beanWriterCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Type, BodyReader<?>> beanReaderCache = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Type, BodyReader<?>> listReaderCache = new ConcurrentHashMap<>();
 
   /**
    * Create passing the Jsonb to use.
@@ -36,7 +38,7 @@ public JsonbBodyAdapter(Jsonb jsonb) {
    * Create with a default Jsonb that allows unknown properties.
    */
   public JsonbBodyAdapter() {
-    this.jsonb = Jsonb.newBuilder().build();
+    this.jsonb = Jsonb.builder().build();
   }
 
   @SuppressWarnings("unchecked")
@@ -51,6 +53,18 @@ 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<T> beanReader(ParameterizedType cls) {
+    return (BodyReader<T>) beanReaderCache.computeIfAbsent(cls, aClass -> new JReader<>(jsonb.type(cls)));
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> BodyReader<List<T>> listReader(ParameterizedType cls) {
+    return (BodyReader<List<T>>) listReaderCache.computeIfAbsent(cls, aClass -> new JReader<>(jsonb.type(cls).list()));
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public <T> BodyReader<List<T>> listReader(Class<T> cls) {

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

@@ -394,7 +394,7 @@ void get_notFound() {
     final HttpResponse<String> hres = request.GET().asString();
 
     assertThat(hres.statusCode()).isEqualTo(404);
-    assertThat(hres.body()).contains("Not found");
+    assertThat(hres.body()).contains("Not Found");
     HttpClientContext.Metrics metrics = clientContext.metrics(true);
     assertThat(metrics.totalCount()).isEqualTo(1);
     assertThat(metrics.errorCount()).isEqualTo(1);