Support 1.13 API with BodyWriter<T>

Author: rbygrave

gson-adapter/pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-client-gson</artifactId>
-  <version>1.13-SNAPSHOT</version>
+  <version>1.13</version>
 
   <scm>
     <developerConnection>scm:git:git@github.com:avaje/avaje-http-client.git</developerConnection>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.12</version>
+      <version>1.13</version>
       <scope>provided</scope>
     </dependency>
 

gson-adapter/src/main/java/io/avaje/http/client/gson/GsonBodyAdapter.java

@@ -10,11 +10,7 @@
 import io.avaje.http.client.BodyReader;
 import io.avaje.http.client.BodyWriter;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -38,10 +34,8 @@ public class GsonBodyAdapter implements BodyAdapter {
 
   private final Gson gson;
 
-  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<>();
 
   /**
@@ -51,11 +45,12 @@ public GsonBodyAdapter(Gson gson) {
     this.gson = gson;
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   @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 {
-        final TypeAdapter<?> adapter = gson.getAdapter(cls);
+        final TypeAdapter adapter = gson.getAdapter(cls);
         return new Writer(gson, adapter);
       } catch (Exception e) {
         throw new RuntimeException(e);
@@ -76,14 +71,14 @@ public <T> BodyReader<T> beanReader(Class<T> cls) {
     });
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   @Override
   public <T> BodyReader<List<T>> listReader(Class<T> cls) {
     return (BodyReader<List<T>>) listReaderCache.computeIfAbsent(cls, aClass -> {
       try {
-        final TypeToken<?> listType = TypeToken.getParameterized(List.class, cls);
-        final TypeAdapter adapter = gson.getAdapter(listType);
-        return new Reader(gson, adapter);
+        final TypeToken listType = TypeToken.getParameterized(List.class, cls);
+        final TypeAdapter<List<T>> adapter = gson.getAdapter(listType);
+        return new Reader<>(gson, adapter);
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
@@ -114,8 +109,7 @@ public T readBody(String content) {
 
     @Override
     public T read(BodyContent body) {
-      try {
-        InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(body.content()));
+      try (InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(body.content()))) {
         final JsonReader jsonReader = gson.newJsonReader(reader);
         return adapter.read(jsonReader);
       } catch (IOException e) {
@@ -124,24 +118,23 @@ public T read(BodyContent body) {
     }
   }
 
-  @SuppressWarnings({"rawtypes"})
-  private static class Writer implements BodyWriter {
+  private static class Writer<T> implements BodyWriter<T> {
 
     private final Gson gson;
-    private final TypeAdapter adapter;
+    private final TypeAdapter<T> adapter;
 
-    Writer(Gson gson, TypeAdapter adapter) {
+    Writer(Gson gson, TypeAdapter<T> adapter) {
       this.gson = gson;
       this.adapter = adapter;
     }
 
     @Override
-    public BodyContent write(Object bean, String contentType) {
+    public BodyContent write(T bean, String contentType) {
       return write(bean);
     }
 
     @Override
-    public BodyContent write(Object bean) {
+    public BodyContent write(T bean) {
       try {
         ByteArrayOutputStream os = new ByteArrayOutputStream(200);
         JsonWriter jsonWriter = gson.newJsonWriter(new OutputStreamWriter(os, UTF_8));