Fix custom type adapters with private fields (#382)

Author: SentryMan

blackbox-test/src/main/java/org/example/other/custom/Example.java

@@ -0,0 +1,36 @@
+package org.example.other.custom;
+
+import java.util.List;
+
+import io.avaje.jsonb.Json;
+
+@Json
+public class Example {
+  private int code;
+  private WrapMap map;
+  private List<WrapMap2> map2;
+
+  public int getCode() {
+    return code;
+  }
+
+  public void setCode(int code) {
+    this.code = code;
+  }
+
+  public WrapMap getMap() {
+    return map;
+  }
+
+  public void setMap(WrapMap map) {
+    this.map = map;
+  }
+
+  public List<WrapMap2> getMap2() {
+    return map2;
+  }
+
+  public void setMap2(List<WrapMap2> map2) {
+    this.map2 = map2;
+  }
+}

blackbox-test/src/main/java/org/example/other/custom/WrapMap.java

@@ -0,0 +1,18 @@
+package org.example.other.custom;
+
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.Set;
+
+public class WrapMap extends AbstractMap<String, String> {
+  private final Map<String, String> delegate;
+
+  public WrapMap(Map<String, String> map) {
+    delegate = map;
+  }
+
+  @Override
+  public Set<Entry<String, String>> entrySet() {
+    return delegate.entrySet();
+  }
+}

blackbox-test/src/main/java/org/example/other/custom/WrapMap2.java

@@ -0,0 +1,18 @@
+package org.example.other.custom;
+
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.Set;
+
+public class WrapMap2 extends AbstractMap<String, String> {
+  private final Map<String, String> delegate;
+
+  public WrapMap2(Map<String, String> map) {
+    delegate = map;
+  }
+
+  @Override
+  public Set<Entry<String, String>> entrySet() {
+    return delegate.entrySet();
+  }
+}

blackbox-test/src/main/java/org/example/other/custom/WrapMap2JsonAdapter.java

@@ -0,0 +1,36 @@
+package org.example.other.custom;
+
+import java.util.Map;
+
+import io.avaje.json.JsonAdapter;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonWriter;
+import io.avaje.jsonb.CustomAdapter;
+import io.avaje.jsonb.Jsonb;
+import io.avaje.jsonb.Types;
+
+@CustomAdapter
+public class WrapMap2JsonAdapter implements JsonAdapter<WrapMap2> {
+  private final JsonAdapter<Map<String, String>> stringMapJsonAdapter;
+
+  public WrapMap2JsonAdapter(Jsonb jsonb) {
+    this.stringMapJsonAdapter =
+        jsonb.adapter(Types.newParameterizedType(Map.class, String.class, String.class));
+  }
+
+  @Override
+  public WrapMap2 fromJson(JsonReader reader) {
+    return new WrapMap2(stringMapJsonAdapter.fromJson(reader));
+  }
+
+  @Override
+  public void toJson(JsonWriter writer, WrapMap2 wrapMap) {
+    writer.beginObject();
+    wrapMap.forEach(
+        (key, value) -> {
+          writer.name(key);
+          writer.value(value);
+        });
+    writer.endObject();
+  }
+}

blackbox-test/src/main/java/org/example/other/custom/WrapMapJsonAdapter.java

@@ -0,0 +1,36 @@
+package org.example.other.custom;
+
+import java.util.Map;
+
+import io.avaje.json.JsonAdapter;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonWriter;
+import io.avaje.jsonb.CustomAdapter;
+import io.avaje.jsonb.Jsonb;
+import io.avaje.jsonb.Types;
+
+@CustomAdapter
+public class WrapMapJsonAdapter implements JsonAdapter<WrapMap> {
+  private final JsonAdapter<Map<String, String>> stringMapJsonAdapter;
+
+  public WrapMapJsonAdapter(Jsonb jsonb) {
+    this.stringMapJsonAdapter =
+        jsonb.adapter(Types.newParameterizedType(Map.class, String.class, String.class));
+  }
+
+  @Override
+  public WrapMap fromJson(JsonReader reader) {
+    return new WrapMap(stringMapJsonAdapter.fromJson(reader));
+  }
+
+  @Override
+  public void toJson(JsonWriter writer, WrapMap wrapMap) {
+    writer.beginObject();
+    wrapMap.forEach(
+        (key, value) -> {
+          writer.name(key);
+          writer.value(value);
+        });
+    writer.endObject();
+  }
+}

blackbox-test/src/test/java/org/example/other/custom/ExampleTest.java

@@ -0,0 +1,34 @@
+package org.example.other.custom;
+
+import io.avaje.jsonb.JsonType;
+import io.avaje.jsonb.Jsonb;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ExampleTest {
+
+  Jsonb jsonb = Jsonb.builder().build();
+  JsonType<Example> jsonType = jsonb.type(Example.class);
+
+  @Test
+  void toFromJson() {
+    Example bean = new Example();
+    bean.setCode(34);
+    bean.setMap(new WrapMap(Map.of("a", "b")));
+    bean.setMap2(List.of(new WrapMap2(Map.of("2a", "z")), new WrapMap2(Map.of("2b", "x"))));
+
+    final String asJson = jsonType.toJson(bean);
+    assertThat(asJson).isEqualTo("{\"code\":34,\"map\":{\"a\":\"b\"},\"map2\":[{\"2a\":\"z\"},{\"2b\":\"x\"}]}");
+
+    final var fromJson = jsonType.fromJson(asJson);
+    assertThat(fromJson.getCode()).isEqualTo(34);
+    assertThat(fromJson.getMap()).containsEntry("a", "b");
+    assertThat(fromJson.getMap2()).hasSize(2);
+    assertThat(fromJson.getMap2().getFirst()).containsEntry("2a", "z");
+    assertThat(fromJson.getMap2().getLast()).containsEntry("2b", "x");
+  }
+}

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

@@ -161,6 +161,11 @@ private void registerCustomAdapters(Set<? extends Element> elements) {
             x -> {},
             () -> logNote(typeElement, "Non-Generic adapters should have a public constructor with a single Jsonb parameter"));
 
+        typeElement.getInterfaces().stream()
+            .filter(t -> t.toString().contains("io.avaje.json.JsonAdapter"))
+            .findFirst()
+            .ifPresent(t -> sourceTypes.add(UType.parse(t).param0().fullWithoutAnnotations()));
+
         meta.add(type);
       }
     }
@@ -229,7 +234,7 @@ private void cascadeTypes() {
   }
 
   private void cascadeTypesInner() {
-    final ArrayList<BeanReader> copy = new ArrayList<>(allReaders);
+    final var copy = new ArrayList<>(allReaders);
     allReaders.clear();
 
     final Set<String> extraTypes = new TreeSet<>();
@@ -239,22 +244,19 @@ private void cascadeTypesInner() {
     for (final String type : extraTypes) {
       if (!ignoreType(type)) {
         final TypeElement element = typeElement(type);
-        if (element != null && cascadeElement(element)) {
+        if (element != null && element.getKind() != ElementKind.ENUM) {
           writeAdapterForType(element);
         }
       }
     }
   }
 
-  private boolean cascadeElement(TypeElement element) {
-    return element.getKind() != ElementKind.ENUM && !writtenTypes.contains(element.toString());
-  }
-
   private boolean ignoreType(String type) {
     return type.indexOf('.') == -1
-      || type.startsWith("java.")
-      || type.startsWith("javax.")
-      || sourceTypes.contains(type);
+        || type.startsWith("java.")
+        || type.startsWith("javax.")
+        || sourceTypes.contains(type)
+        || writtenTypes.contains(type);
   }
 
   /**