Merge pull request #94 from avaje/fix/93-Map-Serialisation-Error

Fix for #93 Map Serialisation Error

Author: rbygrave

blackbox-test/src/main/java/org/example/customer/ALBResponse.java

@@ -0,0 +1,37 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Json;
+
+import java.util.Map;
+
+@Json
+public class ALBResponse {
+
+  private final int statusCode;
+  private final boolean isBase64Encoded;
+  private final Map<String, String> headers;
+  private final String body;
+
+  public ALBResponse(int statusCode, boolean isBase64Encoded, Map<String, String> headers, String body) {
+    this.statusCode = statusCode;
+    this.isBase64Encoded = isBase64Encoded;
+    this.headers = headers;
+    this.body = body;
+  }
+
+  public int getStatusCode() {
+    return statusCode;
+  }
+
+  public boolean isBase64Encoded() {
+    return isBase64Encoded;
+  }
+
+  public Map<String, String> getHeaders() {
+    return headers;
+  }
+
+  public String getBody() {
+    return body;
+  }
+}

blackbox-test/src/main/java/org/example/customer/ALBResponse2.java

@@ -0,0 +1,10 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Json;
+
+import java.util.Map;
+
+@Json
+public record ALBResponse2 (int one, Map<String, String> map1, int two, Map<String, String> map2, String three) {
+
+}

blackbox-test/src/test/java/org/example/customer/ALBResponseTest.java

@@ -0,0 +1,40 @@
+package org.example.customer;
+
+import io.avaje.jsonb.JsonType;
+import io.avaje.jsonb.Jsonb;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ALBResponseTest {
+
+  private final Jsonb jsonb = Jsonb.builder().build();
+
+  @Test
+  void toJson() {
+    ALBResponse response = new ALBResponse(200, false, Map.of("foo", "bar"), "content");
+
+    JsonType<ALBResponse> type = jsonb.type(ALBResponse.class);
+    String asJson = type.toJson(response);
+
+    ALBResponse response1 = type.fromJson(asJson);
+    assertThat(response1.getStatusCode()).isEqualTo(response1.getStatusCode());
+    assertThat(response1.getBody()).isEqualTo("content");
+    assertThat(response1.isBase64Encoded()).isFalse();
+    assertThat(response1.getHeaders()).hasSize(1);
+    assertThat(response1.getHeaders()).containsEntry("foo", "bar");
+  }
+
+  @Test
+  void toJsonTwoScalarMaps() {
+    ALBResponse2 response = new ALBResponse2(10,  Map.of("foo", "bar"), 20, Map.of("baz", "waz"), "content");
+
+    JsonType<ALBResponse2> type = jsonb.type(ALBResponse2.class);
+    String asJson = type.toJson(response);
+
+    ALBResponse2 response1 = type.fromJson(asJson);
+    assertThat(response1).isEqualTo(response);
+  }
+}

jsonb-generator/src/main/java/io/avaje/jsonb/generator/ClassReader.java

@@ -264,8 +264,7 @@ public void writeToJson(Append writer) {
     writer.eol();
     writer.append("  @Override").eol();
     writer.append("  public void toJson(JsonWriter writer, %s %s) {", shortName, varName).eol();
-    writer.append("    writer.beginObject();").eol();
-    writer.append("    writer.names(names);").eol();
+    writer.append("    writer.beginObject(names);").eol();
     if (hasSubTypes) {
       writeToJsonForSubtypes(writer, varName);
     } else {
@@ -418,8 +417,7 @@ String constructorParamName(String name) {
   private void writeFromJsonSwitch(Append writer, boolean defaultConstructor, String varName) {
     writer.eol();
     writer.append("    // read json").eol();
-    writer.append("    reader.beginObject();").eol();
-    writer.append("    reader.names(names);").eol();
+    writer.append("    reader.beginObject(names);").eol();
     writer.append("    while (reader.hasNextField()) {").eol();
     if (caseInsensitiveKeys) {
       writer.append("      final String origFieldName = reader.nextField();").eol();

jsonb-jackson/src/main/java/io/avaje/jsonb/jackson/ArrayStack.java

@@ -5,6 +5,8 @@
 
 final class JacksonNames implements PropertyNames {
 
+  static final JacksonNames EMPTY = new JacksonNames(new String[0]);
+
   private static final NameCache NAME_CACHE = new NameCache();
 
   private final SerializedString[] keys;

jsonb-jackson/src/main/java/io/avaje/jsonb/jackson/JacksonNames.java

@@ -22,11 +22,6 @@ final class JacksonReader implements JsonReader {
     this.failOnUnknown = failOnUnknown;
   }
 
-  @Override
-  public void names(PropertyNames names) {
-    // ignore
-  }
-
   @Override
   public void close() {
     try {
@@ -214,6 +209,11 @@ public byte[] readBinary() {
     }
   }
 
+  @Override
+  public void beginObject(PropertyNames names) {
+    beginObject();
+  }
+
   @Override
   public void beginObject() {
     if (parser.currentToken() == JsonToken.START_OBJECT) {

jsonb-jackson/src/main/java/io/avaje/jsonb/jackson/JacksonReader.java

@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -18,7 +19,7 @@ final class JacksonWriter implements JsonWriter {
   private boolean serializeEmpty;
   private boolean serializeNulls;
   private String deferredName;
-  private final ArrayStack<JacksonNames> nameStack = new ArrayStack<>();
+  private final ArrayDeque<JacksonNames> nameStack = new ArrayDeque<>();
   private JacksonNames currentNames;
   private boolean allNames;
   private int namePos = -1;
@@ -114,8 +115,7 @@ public void endArray() {
     }
   }
 
-  @Override
-  public void beginObject() {
+  private void writeBeginObject() {
     try {
       writeDeferredName();
       generator.writeStartObject();
@@ -124,12 +124,30 @@ public void beginObject() {
     }
   }
 
+  @Override
+  public void beginObject() {
+    writeBeginObject();
+    if (currentNames != null && !allNames) {
+      nameStack.addFirst(currentNames);
+      currentNames = JacksonNames.EMPTY;
+    }
+  }
+
+  @Override
+  public void beginObject(PropertyNames names) {
+    writeBeginObject();
+    if (currentNames != null) {
+      nameStack.addFirst(currentNames);
+    }
+    currentNames = (JacksonNames) names;
+  }
+
   @Override
   public void endObject() {
     try {
       generator.writeEndObject();
       if (!allNames) {
-        currentNames = nameStack.pop();
+        currentNames = nameStack.pollFirst();
       }
     } catch (IOException e) {
       throw new JsonIoException(e);
@@ -147,14 +165,6 @@ public void allNames(PropertyNames names) {
     currentNames = (JacksonNames) names;
   }
 
-  @Override
-  public void names(PropertyNames names) {
-    if (currentNames != null) {
-      nameStack.push(currentNames);
-    }
-    currentNames = (JacksonNames) names;
-  }
-
   @Override
   public void name(int position) {
     this.namePos = position;

jsonb-jackson/src/main/java/io/avaje/jsonb/jackson/JacksonWriter.java

@@ -41,8 +41,7 @@ public void build(ViewBuilder builder, String name, MethodHandle mh) {
 
   @Override
   public void toJson(JsonWriter writer, Address address) {
-    writer.beginObject();
-    writer.names(names);
+    writer.beginObject(names);
     writer.name(0);
     stringAdapter.toJson(writer, address.street());
     writer.name(1);

jsonb-jackson/src/test/java/org/example/AddressJsonAdapter.java

@@ -50,8 +50,7 @@ public void build(ViewBuilder builder, String name, MethodHandle handle) {
 
   @Override
   public void toJson(JsonWriter writer, Customer customer) {
-    writer.beginObject();
-    writer.names(names);
+    writer.beginObject(names);
     writer.name( 0);
     intAdapter.toJson(writer, customer.id());
     writer.name( 1);