JsonType extends JsonView

Author: rbygrave

jsonb/src/main/java/io/avaje/jsonb/JsonType.java

@@ -13,7 +13,7 @@
  * Moshi note: JsonType does not exist in Moshi and has been added to provide a
  * slightly nicer API to use than JsonAdapter.
  */
-public interface JsonType<T> {
+public interface JsonType<T> extends JsonView<T> {
 
   /**
    * Build and return the view given the DSL that specifies the properties to include.
@@ -51,31 +51,6 @@ public interface JsonType<T> {
    */
   JsonType<Map<String, T>> map();
 
-  /**
-   * Return the value as json content.
-   */
-  String toJson(T value);
-
-  /**
-   * Return the value as json content in bytes form.
-   */
-  byte[] toJsonBytes(T value);
-
-  /**
-   * Write the value as json content to the given JsonWriter.
-   */
-  void toJson(JsonWriter writer, T value);
-
-  /**
-   * Write the value as json content to the given writer.
-   */
-  void toJson(Writer writer, T value);
-
-  /**
-   * Write the value as json content to the given outputStream.
-   */
-  void toJson(OutputStream outputStream, T value);
-
   /**
    * Read the return the value from the reader.
    */

jsonb/src/main/java/io/avaje/jsonb/JsonView.java

@@ -34,6 +34,11 @@ public interface JsonView<T> {
    */
   String toJson(T value);
 
+  /**
+   * Return the value as json content in bytes form.
+   */
+  byte[] toJsonBytes(T value);
+
   /**
    * Write to the given writer.
    */

jsonb/src/main/java/io/avaje/jsonb/core/DJsonType.java

@@ -47,16 +47,18 @@ public JsonType<Map<String, T>> map() {
 
   @Override
   public String toJson(T value) {
-    BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter();
-    toJson(bufferedJsonWriter, value);
-    return bufferedJsonWriter.result();
+    try (BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter()) {
+      toJson(bufferedJsonWriter, value);
+      return bufferedJsonWriter.result();
+    }
   }
 
   @Override
   public byte[] toJsonBytes(T value) {
-    BytesJsonWriter bytesWriter = jsonb.bufferedWriterAsBytes();
-    toJson(bytesWriter, value);
-    return bytesWriter.result();
+    try (BytesJsonWriter bytesWriter = jsonb.bufferedWriterAsBytes()) {
+      toJson(bytesWriter, value);
+      return bytesWriter.result();
+    }
   }
 
   @Override

jsonb/src/main/java/io/avaje/jsonb/core/ViewBuilder.java

@@ -2,6 +2,7 @@
 
 import io.avaje.jsonb.*;
 import io.avaje.jsonb.spi.BufferedJsonWriter;
+import io.avaje.jsonb.spi.BytesJsonWriter;
 import io.avaje.jsonb.spi.PropertyNames;
 
 import java.io.IOException;
@@ -194,9 +195,18 @@ private static final class DView<T> implements JsonView<T> {
 
     @Override
     public String toJson(T value) {
-      BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter();
-      toJson(bufferedJsonWriter, value);
-      return bufferedJsonWriter.result();
+      try (BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter()) {
+        toJson(bufferedJsonWriter, value);
+        return bufferedJsonWriter.result();
+      }
+    }
+
+    @Override
+    public byte[] toJsonBytes(T value) {
+      try (BytesJsonWriter bytesWriter = jsonb.bufferedWriterAsBytes()) {
+        toJson(bytesWriter, value);
+        return bytesWriter.result();
+      }
     }
 
     @Override