Change toJson() methods on JsonView/Type to have value as first argument

Author: rbygrave

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

@@ -42,15 +42,15 @@ public interface JsonView<T> {
   /**
    * Write to the given writer.
    */
-  void toJson(JsonWriter writer, T value);
+  void toJson(T value, JsonWriter writer);
 
   /**
    * Write to the given writer.
    */
-  void toJson(Writer writer, T value);
+  void toJson(T value, Writer writer);
 
   /**
    * Write to the given outputStream.
    */
-  void toJson(OutputStream outputStream, T value);
+  void toJson(T value, OutputStream outputStream);
 }

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

@@ -212,11 +212,12 @@ interface Builder {
     /**
      * Explicitly set the adapter to use.
      * <p>
-     * When not set the IOAdapter is service loaded using {@link AdapterFactory}.
+     * When not set the JsonStreamAdapter is service loaded using {@link AdapterFactory}
+     * with a fallback default of using the builtin implementation.
      *
-     * @param adapter The adapter to use
+     * @param streamAdapter The underlying adapter to use when generating and parsing
      */
-    Builder adapter(JsonStreamAdapter adapter);
+    Builder adapter(JsonStreamAdapter streamAdapter);
 
     /**
      * Add a JsonAdapter to use for the given type.

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

@@ -47,34 +47,34 @@ public JsonType<Map<String, T>> map() {
 
   @Override
   public String toJson(T value) {
-    try (BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter()) {
-      toJson(bufferedJsonWriter, value);
-      return bufferedJsonWriter.result();
+    try (BufferedJsonWriter writer = jsonb.bufferedWriter()) {
+      toJson(value, writer);
+      return writer.result();
     }
   }
 
   @Override
   public byte[] toJsonBytes(T value) {
-    try (BytesJsonWriter bytesWriter = jsonb.bufferedWriterAsBytes()) {
-      toJson(bytesWriter, value);
-      return bytesWriter.result();
+    try (BytesJsonWriter writer = jsonb.bufferedWriterAsBytes()) {
+      toJson(value, writer);
+      return writer.result();
     }
   }
 
   @Override
-  public void toJson(JsonWriter writer, T value) {
+  public void toJson(T value, JsonWriter writer) {
     adapter.toJson(writer, value);
   }
 
   @Override
-  public void toJson(Writer writer, T value) {
-    try (JsonWriter jw = jsonb.writer(writer)) {
-      adapter.toJson(jw, value);
+  public void toJson(T value, Writer writer) {
+    try (JsonWriter jsonWriter = jsonb.writer(writer)) {
+      adapter.toJson(jsonWriter, value);
     }
   }
 
   @Override
-  public void toJson(OutputStream outputStream, T value) {
+  public void toJson(T value, OutputStream outputStream) {
     try (JsonWriter writer = jsonb.writer(outputStream)) {
       adapter.toJson(writer, value);
     }

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

@@ -203,8 +203,8 @@ public Builder mathTypesAsString(boolean mathTypesAsString) {
     }
 
     @Override
-    public Builder adapter(JsonStreamAdapter adapter) {
-      this.adapter = adapter;
+    public Builder adapter(JsonStreamAdapter streamAdapter) {
+      this.adapter = streamAdapter;
       return this;
     }
 

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

@@ -195,22 +195,22 @@ private static final class DView<T> implements JsonView<T> {
 
     @Override
     public String toJson(T value) {
-      try (BufferedJsonWriter bufferedJsonWriter = jsonb.bufferedWriter()) {
-        toJson(bufferedJsonWriter, value);
-        return bufferedJsonWriter.result();
+      try (BufferedJsonWriter writer = jsonb.bufferedWriter()) {
+        toJson(value, writer);
+        return writer.result();
       }
     }
 
     @Override
     public byte[] toJsonBytes(T value) {
-      try (BytesJsonWriter bytesWriter = jsonb.bufferedWriterAsBytes()) {
-        toJson(bytesWriter, value);
-        return bytesWriter.result();
+      try (BytesJsonWriter writer = jsonb.bufferedWriterAsBytes()) {
+        toJson(value, writer);
+        return writer.result();
       }
     }
 
     @Override
-    public void toJson(JsonWriter writer, T value) {
+    public void toJson(T value, JsonWriter writer) {
       if (properties != null) {
         writer.names(properties);
       }
@@ -222,16 +222,16 @@ public void toJson(JsonWriter writer, T value) {
     }
 
     @Override
-    public void toJson(Writer writer, T value) {
-      try (JsonWriter jw = jsonb.writer(writer)) {
-        toJson(jw, value);
+    public void toJson(T value, Writer writer) {
+      try (JsonWriter jsonWriter = jsonb.writer(writer)) {
+        toJson(value, jsonWriter);
       }
     }
 
     @Override
-    public void toJson(OutputStream outputStream, T value) {
-      try (JsonWriter jw = jsonb.writer(outputStream)) {
-        toJson(jw, value);
+    public void toJson(T value, OutputStream outputStream) {
+      try (JsonWriter writer = jsonb.writer(outputStream)) {
+        toJson(value, writer);
       }
     }
   }
@@ -327,7 +327,7 @@ public void write(JsonWriter writer, Object object) {
       } else {
         writer.beginArray();
         for (final Object value : collection) {
-          child.toJson(writer, value);
+          child.toJson(value, writer);
         }
         writer.endArray();
       }
@@ -357,7 +357,7 @@ public void write(JsonWriter writer, Object object) {
         } else {
           writer.beginArray();
           for (final Object value : collection) {
-            child.toJson(writer, value);
+            child.toJson(value, writer);
           }
           writer.endArray();
         }