Merge remote-tracking branch 'upstream/main' into type

Author: SentryMan

.gitignore

@@ -7,3 +7,4 @@ build/
 *.classpath
 *.project
 *.class
+.DS_Store

blackbox-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>1.4-RC8</version>
+    <version>1.4-RC9</version>
   </parent>
 
   <artifactId>blackbox-test</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.4-RC8</version>
+      <version>1.4-RC9</version>
     </dependency>
 
 <!--    <dependency>-->
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb-generator</artifactId>
-      <version>1.4-RC8</version>
+      <version>1.4-RC9</version>
       <scope>provided</scope>
     </dependency>
 

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/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>1.4-RC8</version>
+    <version>1.4-RC9</version>
   </parent>
 
   <artifactId>avaje-jsonb-generator</artifactId>

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/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-jsonb-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>1.4-RC8</version>
+    <version>1.4-RC9</version>
   </parent>
 
   <artifactId>avaje-jsonb-jackson</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.4-RC8</version>
+      <version>1.4-RC9</version>
     </dependency>
 
     <dependency>

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;