Stream - refactor move name stack into underlying parser and generator

Author: rbygrave

blackbox-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
   </parent>
 
   <artifactId>blackbox-test</artifactId>
@@ -22,14 +22,14 @@
 
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsonb-jackson</artifactId>
-      <version>0.10-SNAPSHOT</version>
+      <artifactId>avaje-jsonb</artifactId>
+      <version>0.11-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb-generator</artifactId>
-      <version>0.10-SNAPSHOT</version>
+      <version>0.11-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 

blackbox-test/src/main/java/org/example/customer/nesting/Nesting.java

@@ -0,0 +1,26 @@
+package org.example.customer.nesting;
+
+import io.avaje.jsonb.Json;
+
+import java.util.List;
+
+public class Nesting {
+
+  @Json
+  public record One(String a, List<Two> twos, int b, Three three, long c) {
+  }
+
+  @Json
+  public record Two(long f, Four four, String g) {
+
+  }
+
+  @Json
+  public record Three(String other) {
+  }
+
+  @Json
+  public record Four(String four) {
+  }
+
+}

blackbox-test/src/test/java/org/example/customer/nesting/NestingTest.java

@@ -0,0 +1,32 @@
+package org.example.customer.nesting;
+
+import io.avaje.jsonb.Jsonb;
+import org.example.customer.nesting.Nesting.*;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class NestingTest {
+
+  Jsonb jsonb = Jsonb.newBuilder().build();
+
+  @Test
+  void asd() {
+
+    var one = new One("hi",
+      List.of(new Two(44, new Four("f1"), "g1"), new Two(45, new Four("f2"), "g2")),
+      89,
+      new Three("ot"), 909L);
+
+    String asJson = jsonb.toJson(one);
+
+    assertThat(asJson).isEqualTo("{\"a\":\"hi\",\"twos\":[{\"f\":44,\"four\":{\"four\":\"f1\"},\"g\":\"g1\"},{\"f\":45,\"four\":{\"four\":\"f2\"},\"g\":\"g2\"}],\"b\":89,\"three\":{\"other\":\"ot\"},\"c\":909}");
+
+
+    One fromJson = jsonb.type(One.class).fromJson(asJson);
+
+    assertThat(fromJson).isEqualTo(one);
+  }
+}

jsonb/src/main/java/io/avaje/jsonb/stream/ArrayStack.java

@@ -37,4 +37,7 @@ E pop() {
     return len == 0 ? null : list.remove(len - 1);
   }
 
+  void clear() {
+    list.clear();
+  }
 }

jsonb/src/main/java/io/avaje/jsonb/stream/JGenerator.java

@@ -60,6 +60,8 @@ final class JGenerator implements JsonGenerator {
   private int position;
   private boolean pretty;
   private int depth;
+  private final ArrayStack<JsonNames> nameStack = new ArrayStack<>();
+  private JsonNames currentNames;
 
   JGenerator() {
     this(512);
@@ -78,6 +80,7 @@ JsonGenerator prepare(OutputStream targetStream) {
     lastOp = 0;
     position = 0;
     pretty = false;
+    nameStack.clear();
     return this;
   }
 
@@ -438,6 +441,7 @@ public void startObject() {
 
   @Override
   public void endObject() {
+    currentNames = nameStack.pop();
     if (pretty) {
       writeNewLine();
       depth--;
@@ -480,16 +484,24 @@ private void prettyIndent() {
   }
 
   @Override
-  public void writeName(String name) {
+  public void names(JsonNames nextNames) {
+    if (currentNames != null) {
+      nameStack.push(currentNames);
+    }
+    currentNames = nextNames;
+  }
+
+  @Override
+  public void writeName(int namePos) {
     prefixName();
-    writeString(name);
+    writeAscii(currentNames.key(namePos));
     writeColon();
   }
 
   @Override
-  public void writeName(byte[] escapedName) {
+  public void writeName(String name) {
     prefixName();
-    writeAscii(escapedName);
+    writeString(name);
     writeColon();
   }
 

jsonb/src/main/java/io/avaje/jsonb/stream/JParser.java

@@ -81,9 +81,8 @@ enum UnknownNumberParsing {
   private final byte[] originalBuffer;
   private final int originalBufferLenWithExtraSpace;
 
-  private ArrayStack<JsonNames> nameStack;
+  private final ArrayStack<JsonNames> nameStack = new ArrayStack<>();
   private JsonNames currentNames;
-  private boolean pushedNames;
 
   final ErrorInfo errorInfo;
   final DoublePrecision doublePrecision;
@@ -128,6 +127,7 @@ public void close() {
     this.currentIndex = 0;
     this.length = 0;
     this.readLimit = 0;
+    this.nameStack.clear();
     this.stream = null;
   }
 
@@ -140,6 +140,7 @@ public void close() {
    * @return itself
    */
   public JParser process(final InputStream stream) {
+    this.nameStack.clear();
     this.currentPosition = 0;
     this.currentIndex = 0;
     this.stream = stream;
@@ -169,6 +170,7 @@ public JParser process(final byte[] newBuffer, final int newLength) {
     if (newLength > buffer.length) {
       throw new IllegalArgumentException("length can't be longer than buffer.length");
     }
+    this.nameStack.clear();
     this.currentIndex = 0;
     this.length = newLength;
     this.stream = null;
@@ -178,20 +180,10 @@ public JParser process(final byte[] newBuffer, final int newLength) {
 
   @Override
   public void names(JsonNames nextNames) {
-    if (currentNames != nextNames) {
-      if (currentNames != null) {
-        pushCurrentNames();
-      }
-      currentNames = nextNames;
-    }
-  }
-
-  private void pushCurrentNames() {
-    if (nameStack == null) {
-      nameStack = new ArrayStack<>();
+    if (currentNames != null) {
+      nameStack.push(currentNames);
     }
-    pushedNames = true;
-    nameStack.push(currentNames);
+    currentNames = nextNames;
   }
 
   /**
@@ -967,10 +959,7 @@ public void startObject() {
    */
   @Override
   public void endObject() {
-    if (pushedNames) {
-      pushedNames = false;
-      currentNames = nameStack != null ? nameStack.pop() : null;
-    }
+    currentNames = nameStack.pop();
     if (last != '}' && nextToken() != '}') {
       if (currentIndex >= length) throw newParseErrorAt("Unexpected end in JSON", 0, eof);
       throw newParseError("Expecting '}' as object end");

jsonb/src/main/java/io/avaje/jsonb/stream/JsonGenerator.java

@@ -36,14 +36,21 @@ interface JsonGenerator extends Closeable, Flushable {
   void endObject();
 
   /**
-   * Write a field name.
+   * Set the already encoded and escaped names that can be used via {@link #writeName(int)}.
    */
-  void writeName(String name);
+  void names(JsonNames nextNames);
 
   /**
    * Write a field name that is already encoded and escaped.
+   * <p>
+   * The namePos is the name position in the JsonNames that has been set.
    */
-  void writeName(byte[] escapedName);
+   void writeName(int namePos);
+
+  /**
+   * Write a field name.
+   */
+  void writeName(String name);
 
   /**
    * Write null value.

jsonb/src/main/java/io/avaje/jsonb/stream/JsonReadAdapter.java

@@ -58,8 +58,7 @@ public boolean hasNextField() {
       return true;
     }
     if (nextToken == ',') {
-      nextToken = reader.nextToken();
-      return nextToken == '"';
+      return reader.nextToken() == '"';
     } else {
       return false;
     }

jsonb/src/main/java/io/avaje/jsonb/stream/JsonWriteAdapter.java

@@ -17,9 +17,6 @@ final class JsonWriteAdapter implements JsonWriter {
   private boolean serializeEmpty;
   private boolean serializeNulls;
   private String deferredName;
-  private ArrayStack<JsonNames> nameStack;
-  private JsonNames currentNames;
-  private boolean pushedNames;
   private int namePos = -1;
 
   JsonWriteAdapter(JsonGenerator generator, boolean serializeNulls, boolean serializeEmpty) {
@@ -96,10 +93,6 @@ public void beginObject() {
   @Override
   public void endObject() {
     generator.endObject();
-    if (pushedNames) {
-      pushedNames = false;
-      currentNames = nameStack != null ? nameStack.pop() : null;
-    }
   }
 
   @Override
@@ -109,20 +102,7 @@ public void name(String name) {
 
   @Override
   public void names(PropertyNames nextNames) {
-    if (currentNames != nextNames) {
-      if (currentNames != null) {
-        pushCurrentNames();
-      }
-      currentNames = (JsonNames) nextNames;
-    }
-  }
-
-  private void pushCurrentNames() {
-    if (nameStack == null) {
-      nameStack = new ArrayStack<>();
-    }
-    pushedNames = true;
-    nameStack.push(currentNames);
+    generator.names((JsonNames) nextNames);
   }
 
   @Override
@@ -132,7 +112,7 @@ public void name(int position) {
 
   void writeDeferredName() throws IOException {
     if (namePos > -1) {
-      generator.writeName(currentNames.key(namePos));
+      generator.writeName(namePos);
       namePos = -1;
     } else if (deferredName != null) {
       generator.writeName(deferredName);