Merge pull request #379 from SentryMan/pkg-private-custom

Support pkg private custom adapters

Author: SentryMan

blackbox-test/src/main/java/module-info.java

@@ -10,6 +10,7 @@
   provides JsonbExtension
     with
       org.example.customer.customtype.CustomTypeComponent,
+      org.example.other.custom.CustomJsonComponent,
       org.example.jsonb.GeneratedJsonComponent,
       org.example.pkg_private.PkgPrivateJsonComponent;
 

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

@@ -8,7 +8,7 @@
 import io.avaje.json.*;
 
 @CustomAdapter
-public class CustomEntryJsonAdapter<K, V> implements JsonAdapter<Entry<K, V>> {
+class CustomEntryJsonAdapter<K, V> implements JsonAdapter<Entry<K, V>> {
 
   private final JsonAdapter<K> generic1;
   private final JsonAdapter<V> generic2;

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

@@ -31,7 +31,7 @@ void addFactory(String fullName) {
     factoryTypes.add(fullName);
   }
 
-  public void addWithType(String type) {
+  void addWithType(String type) {
     withTypes.add(type);
   }
 
@@ -41,7 +41,9 @@ void setFullName(String fullName) {
 
   String fullName(boolean pkgPrivate) {
     if (fullName == null) {
-      String topPackage = TopPackage.of(allTypes);
+      var everyType = new ArrayList<>(allTypes);
+      everyType.addAll(factoryTypes);
+      String topPackage = TopPackage.of(everyType);
       if (!topPackage.endsWith(".jsonb") && !pkgPrivate) {
         topPackage += ".jsonb";
       }
@@ -83,7 +85,7 @@ Collection<String> allImports() {
     return packageImports;
   }
 
-  public boolean isEmpty() {
+  boolean isEmpty() {
     return allTypes.isEmpty() && factoryTypes.isEmpty();
   }
 

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

@@ -137,6 +137,8 @@ private Optional<? extends Set<? extends Element>> getElements(RoundEnvironment
 
   private void registerCustomAdapters(Set<? extends Element> elements) {
     for (final var typeElement : ElementFilter.typesIn(elements)) {
+      var pkgPrivate = !typeElement.getModifiers().contains(Modifier.PUBLIC);
+      var meta = pkgPrivate ? pkgPrivateMetaData(typeElement) : metaData;
       final var type = typeElement.getQualifiedName().toString();
       if (isGenericJsonAdapter(typeElement)) {
         ElementFilter.fieldsIn(typeElement.getEnclosedElements()).stream()
@@ -146,7 +148,7 @@ private void registerCustomAdapters(Set<? extends Element> elements) {
             x -> {},
             () -> logError(typeElement, "Generic adapters require a public static AdapterFactory FACTORY field"));
 
-        metaData.addFactory(type);
+        meta.addFactory(type);
       } else {
         ElementFilter.constructorsIn(typeElement.getEnclosedElements()).stream()
           .filter(m -> m.getModifiers().contains(Modifier.PUBLIC))
@@ -159,11 +161,16 @@ private void registerCustomAdapters(Set<? extends Element> elements) {
             x -> {},
             () -> logNote(typeElement, "Non-Generic adapters should have a public constructor with a single Jsonb parameter"));
 
-        metaData.add(type);
+        meta.add(type);
       }
     }
   }
 
+  private ComponentMetaData pkgPrivateMetaData(TypeElement typeElement) {
+    var packageName = APContext.elements().getPackageOf(typeElement).getQualifiedName().toString();
+    return privateMetaData.computeIfAbsent(packageName, k -> new ComponentMetaData());
+  }
+
   private static boolean isGenericJsonAdapter(TypeElement typeElement) {
     return typeElement.getInterfaces().stream()
       .map(UType::parse)
@@ -299,13 +306,13 @@ private static TypeElement implementationType(ImportPrism importPrism) {
   private void writeComponent(boolean processingOver) {
     if (processingOver) {
       try {
-        if (!metaData.all().isEmpty()) {
+        if (!metaData.isEmpty()) {
           componentWriter.initialise(false);
           componentWriter.write();
         }
 
         for (var meta : privateMetaData.values()) {
-          if (meta.all().isEmpty()) {
+          if (meta.isEmpty()) {
             continue;
           }
           var writer = new SimpleComponentWriter(meta);
@@ -370,9 +377,7 @@ private void writeAdapter(TypeElement typeElement, BeanReader beanReader) {
     try {
       final SimpleAdapterWriter beanWriter = new SimpleAdapterWriter(beanReader);
       if (beanReader.isPkgPrivate()) {
-        var packageName = APContext.elements().getPackageOf(typeElement).getQualifiedName().toString();
-        var meta = privateMetaData.computeIfAbsent(packageName, k -> new ComponentMetaData());
-        writeMeta(beanWriter, meta);
+        writeMeta(beanWriter, pkgPrivateMetaData(typeElement));
       } else {
         writeMeta(beanWriter, metaData);
       }

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

@@ -4,7 +4,7 @@
 
 final class TopPackage {
 
-  private String topPackage;
+  private String topPackage = "";
 
   static String of(Collection<String> values) {
     return new TopPackage(values).value();

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

@@ -53,7 +53,7 @@ private static String trimArrayBrackets(String type) {
 
   static String packageOf(String cls) {
     int pos = cls.lastIndexOf('.');
-    return (pos == -1) ? "" : cls.substring(0, pos);
+    return pos == -1 ? "" : cls.substring(0, pos);
   }
 
   static String shortName(String fullType) {
@@ -115,7 +115,7 @@ private static String cutAnnotations(String input) {
   /** Return the common parent package. */
   static String commonParent(String currentTop, String aPackage) {
     if (aPackage == null) return currentTop;
-    if (currentTop == null) return packageOf(aPackage);
+    if (currentTop.isBlank()) return packageOf(aPackage);
     if (aPackage.startsWith(currentTop)) {
       return currentTop;
     }

jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/valid/pkg_private/MoneySerializer.java

@@ -0,0 +1,27 @@
+package io.avaje.jsonb.generator.models.valid.pkg_private;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+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;
+
+@CustomAdapter
+class MoneySerializer implements JsonAdapter<BigDecimal> {
+
+  /** Constructor takes Jsonb, registered via AdapterBuilder */
+  public MoneySerializer(Jsonb jsonb) {}
+
+  @Override
+  public BigDecimal fromJson(JsonReader reader) {
+    return reader.readDecimal().setScale(2, RoundingMode.DOWN);
+  }
+
+  @Override
+  public void toJson(JsonWriter writer, BigDecimal value) {
+    writer.value(value.setScale(2, RoundingMode.DOWN));
+  }
+}