#33 - Fix for matching getters/setters for boolean/Boolean types with "is" prefix isActive -> setActive() & getActive()

Author: rbygrave

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

@@ -0,0 +1,51 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Json;
+
+@Json
+public class PubFieldsAndAccessors {
+
+  public String name;
+  public int score;
+
+  // match the setter for isActive to setActive()
+  private boolean isActive;
+
+  // match the getter for isRegistered to getRegistered()
+  private Boolean isRegistered;
+
+  public String getName() {
+    return name;
+  }
+
+  public PubFieldsAndAccessors setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public int getScore() {
+    return score;
+  }
+
+  public PubFieldsAndAccessors setScore(int score) {
+    this.score = score;
+    return this;
+  }
+
+  public boolean isActive() {
+    return isActive;
+  }
+
+  public PubFieldsAndAccessors setActive(boolean active) {
+    isActive = active;
+    return this;
+  }
+
+  public Boolean getRegistered() {
+    return isRegistered;
+  }
+
+  public void setRegistered(Boolean registered) {
+    isRegistered = registered;
+  }
+}

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

@@ -0,0 +1,51 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Jsonb;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PubFieldsAndAccessorsTest {
+
+  Jsonb jsonb = Jsonb.builder().build();
+
+  @Test
+  void toJsonFromJson() {
+    var bean = new PubFieldsAndAccessors();
+    bean.name = "foo";
+    bean.score = 42;
+    bean.setActive(true);
+    bean.setRegistered(true);
+
+    String asJson = jsonb.toJson(bean);
+    assertThat(asJson).isEqualTo("{\"name\":\"foo\",\"score\":42,\"isActive\":true,\"isRegistered\":true}");
+
+    PubFieldsAndAccessors fromJson = jsonb.type(PubFieldsAndAccessors.class).fromJson(asJson);
+    assertThat(fromJson.name).isEqualTo("foo");
+    assertThat(fromJson.score).isEqualTo(42);
+    assertThat(fromJson.isActive()).isEqualTo(true);
+    assertThat(fromJson.getRegistered()).isEqualTo(true);
+  }
+
+  @Test
+  void objectBooleanAsNull() {
+    var bean = new PubFieldsAndAccessors();
+    bean.name = "foo";
+
+    String asJson = jsonb.toJson(bean);
+    assertThat(asJson).isEqualTo("{\"name\":\"foo\",\"score\":0,\"isActive\":false}");
+
+    PubFieldsAndAccessors fromJson = jsonb.type(PubFieldsAndAccessors.class).fromJson(asJson);
+    assertThat(fromJson.name).isEqualTo("foo");
+    assertThat(fromJson.score).isEqualTo(0);
+    assertThat(fromJson.isActive()).isEqualTo(false);
+    assertThat(fromJson.getRegistered()).isNull();
+
+
+    PubFieldsAndAccessors fromJsonWithNull = jsonb.type(PubFieldsAndAccessors.class).fromJson("{\"name\":\"bar\",\"isRegistered\":null}");
+    assertThat(fromJsonWithNull.name).isEqualTo("bar");
+    assertThat(fromJsonWithNull.score).isEqualTo(0);
+    assertThat(fromJsonWithNull.isActive()).isEqualTo(false);
+    assertThat(fromJsonWithNull.getRegistered()).isNull();
+  }
+}

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

@@ -84,6 +84,18 @@ String propertyName() {
     return propertyName;
   }
 
+  boolean typeObjectBooleanWithIsPrefix() {
+    return nameHasIsPrefix() && genericType.topType().equals("java.lang.Boolean");
+  }
+
+  boolean typeBooleanWithIsPrefix() {
+    return nameHasIsPrefix() && (genericType.topType().equals("boolean") || genericType.topType().equals("java.lang.Boolean"));
+  }
+
+  private boolean nameHasIsPrefix() {
+    return fieldName.length() > 2 && fieldName.startsWith("is") && Character.isUpperCase(fieldName.charAt(2));
+  }
+
   boolean isRaw() {
     return raw;
   }
@@ -215,10 +227,10 @@ void writeToJson(Append writer, String varName, String prefix) {
   }
 
   private void writeGetValue(Append writer, String varName, String suffix) {
-    if (publicField) {
-      writer.append("%s.%s%s", varName, fieldName, suffix);
-    } else if (getter != null) {
+    if (getter != null) {
       writer.append("%s.%s()%s", varName, getter.getName(), suffix);
+    } else if (publicField) {
+      writer.append("%s.%s%s", varName, fieldName, suffix);
     } else {
       writer.append("FIXME: field %s is not public and has not getter ? ", fieldName);
     }

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

@@ -171,8 +171,14 @@ private boolean matchFieldToSetter2(FieldReader field, boolean loose) {
     if (setter != null) {
       field.setterMethod(setter);
       return true;
-    } else {
-      setter = setterLookup(setterName(name), loose);
+    }
+    setter = setterLookup(setterName(name), loose);
+    if (setter != null) {
+      field.setterMethod(setter);
+      return true;
+    }
+    if (field.typeBooleanWithIsPrefix()) { // isActive -> setActive() for boolean and Boolean
+      setter = setterLookup(setterName(name.substring(2)), loose);
       if (setter != null) {
         field.setterMethod(setter);
         return true;
@@ -229,6 +235,13 @@ private boolean matchFieldToGetter2(FieldReader field, boolean loose) {
       field.getterMethod(getter);
       return true;
     }
+    if (field.typeObjectBooleanWithIsPrefix()) { // isRegistered -> getRegistered() for Boolean
+      getter = getterLookup(getterName(name.substring(2)), loose);
+      if (getter != null) {
+        field.getterMethod(getter);
+        return true;
+      }
+    }
     return false;
   }