#34 - Fix JsonView should use property name rather than field name

Author: rbygrave

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

@@ -14,6 +14,9 @@ public class PubFieldsAndAccessors {
   // match the getter for isRegistered to getRegistered()
   private Boolean isRegistered;
 
+  @Json.Property("problem")
+  private Boolean isProblem;
+
   public String getName() {
     return name;
   }
@@ -48,4 +51,13 @@ public Boolean getRegistered() {
   public void setRegistered(Boolean registered) {
     isRegistered = registered;
   }
+
+  public Boolean getProblem() {
+    return isProblem;
+  }
+
+  public PubFieldsAndAccessors setProblem(Boolean problem) {
+    isProblem = problem;
+    return this;
+  }
 }

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

@@ -1,5 +1,6 @@
 package org.example.customer;
 
+import io.avaje.jsonb.JsonView;
 import io.avaje.jsonb.Jsonb;
 import org.junit.jupiter.api.Test;
 
@@ -48,4 +49,18 @@ void objectBooleanAsNull() {
     assertThat(fromJsonWithNull.isActive()).isEqualTo(false);
     assertThat(fromJsonWithNull.getRegistered()).isNull();
   }
+
+  @Test
+  void viewUsesPropertyName() {
+    var bean = new PubFieldsAndAccessors();
+    bean.name = "foo";
+    bean.setProblem(true);
+
+    String asJson = jsonb.toJson(bean);
+    assertThat(asJson).isEqualTo("{\"name\":\"foo\",\"score\":0,\"isActive\":false,\"problem\":true}");
+
+    JsonView<PubFieldsAndAccessors> view = jsonb.type(PubFieldsAndAccessors.class).view("name,problem");
+    String viewJson = view.toJson(bean);
+    assertThat(viewJson).isEqualTo("{\"name\":\"foo\",\"problem\":true}");
+  }
 }

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

@@ -304,10 +304,10 @@ void writeFromJsonUnmapped(Append writer, String varName) {
 
   void writeViewBuilder(Append writer, String shortName) {
     if (getter == null) {
-      writer.append("    builder.add(\"%s\", %s, builder.field(%s.class, \"%s\"));", fieldName, adapterFieldName, shortName, fieldName).eol();
+      writer.append("    builder.add(\"%s\", %s, builder.field(%s.class, \"%s\"));", propertyName, adapterFieldName, shortName, fieldName).eol();
     } else {
       final String topType = genericType.topType();
-      writer.append("    builder.add(\"%s\", %s, builder.method(%s.class, \"%s\", %s.class));", fieldName, adapterFieldName, shortName, getter.getName(), topType).eol();
+      writer.append("    builder.add(\"%s\", %s, builder.method(%s.class, \"%s\", %s.class));", propertyName, adapterFieldName, shortName, getter.getName(), topType).eol();
     }
   }
 }