Enable package-private Getters/Setters/Constructors (#251)

* only write to .jsonb when packages are split

* allow package-private methods/constructors

* Update AdapterName.java

* Update PackagePrivate.java

* use modules to determine if it's imported

* I guess no pkg private classes

* fix pkg private classes

* Format only changes

---------

Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>

Author: SentryMan

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

@@ -19,7 +19,11 @@ final class AdapterName {
     } else {
       shortName = name;
     }
-    this.adapterPackage = "".equals(originPackage) ? "jsonb" : originPackage + ".jsonb";
+    if ("".equals(originPackage)) {
+      this.adapterPackage = "jsonb";
+    } else {
+      this.adapterPackage = ProcessingContext.isImported(origin) ? originPackage + ".jsonb" : originPackage;
+    }
     this.fullName = adapterPackage + "." + shortName + "JsonAdapter";
   }
 

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

@@ -171,7 +171,7 @@ private Set<String> importTypes() {
     if (!hasSubTypes) {
       importTypes.add(Constants.METHODHANDLE);
     }
-    if (Util.validImportType(type)) {
+    if (Util.validImportType(type) && !ProcessingContext.isImported(beanType)) {
       importTypes.add(type);
     }
     for (final FieldReader allField : allFields) {

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

@@ -232,7 +232,7 @@ private void writeGetValue(Append writer, String varName, String suffix) {
     } else if (publicField) {
       writer.append("%s.%s%s", varName, fieldName, suffix);
     } else {
-      throw new IllegalStateException("Field " + fieldName + " is inaccessible. Add a getter or make the field public.");
+      throw new IllegalStateException("Field " + fieldName + " is inaccessible. Add a getter or make the field public or package-private.");
     }
   }
 
@@ -278,6 +278,9 @@ void writeFromJsonSetter(Append writer, String varName, String prefix, String nu
       writeFromJsonUnmapped(writer, varName);
       return;
     }
+    if (constructorParam) {
+      return;
+    }
     if (setter != null && optional) {
       writer.append("%s    _$%s.%s(_val$%s);", prefix, varName, setter.getName(), fieldName + num).eol();
     } else if (setter != null) {

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

@@ -48,7 +48,7 @@ final class FieldReader {
     this.raw = RawPrism.isPresent(element);
 
     final var fieldName = element.getSimpleName().toString();
-    final var publicField = !isMethod && !isParam && element.getModifiers().contains(Modifier.PUBLIC);
+    final var publicField = !isMethod && !isParam && Util.isPublic(element);
     final var type = isMethod ? ((ExecutableElement) element).getReturnType() : element.asType();
 
     this.property = new FieldProperty(type, raw, unmapped, genericTypeParams, publicField, fieldName);

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

@@ -215,7 +215,6 @@ private void writeAdaptersForMixInTypes(Set<? extends Element> mixInElements) {
       final TypeMirror mirror = MixInPrism.getInstanceOn(mixin).value();
       final String importType = mirror.toString();
       final TypeElement element = asTypeElement(mirror);
-
       mixInImports.add(importType);
       writeAdapterForMixInType(element, typeElement(mixin.asType().toString()));
     }

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

@@ -46,7 +46,7 @@ List<MethodParam> getParams() {
   }
 
   boolean isPublic() {
-    return element.getModifiers().contains(Modifier.PUBLIC);
+    return Util.isPublic(element);
   }
 
   boolean isProtected() {

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

@@ -16,6 +16,7 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
@@ -67,6 +68,11 @@ static Optional<JsonPrism> importedJson(TypeElement type) {
     return Optional.ofNullable(CTX.get().importedJsonMap.get(type.asType().toString()));
   }
 
+  static boolean isImported(Element element) {
+    var moduleName = APContext.getProjectModuleElement().getQualifiedName();
+    return !APContext.elements().getModuleOf(element).getQualifiedName().contentEquals(moduleName);
+  }
+
   static List<SubTypePrism> importedSubtypes(TypeElement type) {
     return CTX.get().importedSubtypeMap.getOrDefault(type.asType().toString(), List.of());
   }

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

@@ -79,16 +79,18 @@ final class TypeReader {
 
     jsonCreator = jsonCreator.or(baseJsonCreator(baseType));
     constructor = jsonCreator
-      .map(TypeReader::readJsonCreator)
+      .map(this::readJsonCreator)
       .orElse(null);
 
     this.hasJsonCreator = jsonCreator.isPresent();
   }
 
-  private static MethodReader readJsonCreator(ExecutableElement ex) {
+  private MethodReader readJsonCreator(ExecutableElement ex) {
     var mods = ex.getModifiers();
-    if (ex.getKind() != ElementKind.CONSTRUCTOR && !mods.contains(Modifier.STATIC) && !mods.contains(Modifier.PUBLIC)) {
-      logError(ex, "@Json.Creator can only be placed on contructors and static factory methods");
+    if (ex.getKind() != ElementKind.CONSTRUCTOR
+        && !mods.contains(Modifier.STATIC)
+        && Util.isPublic(ex)) {
+      logError(ex, "@Json.Creator can only be placed on constructors and static factory methods");
     }
     return new MethodReader(ex).read();
   }
@@ -263,7 +265,7 @@ private void readMethod(Element element, List<FieldReader> localFields) {
   }
 
   private boolean checkMethod2(ExecutableElement methodElement) {
-    if (!methodElement.getModifiers().contains(Modifier.PUBLIC)) {
+    if (!Util.isPublic(methodElement)) {
       return false;
     }
     if (extendsThrowable) {

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

@@ -1,6 +1,9 @@
 package io.avaje.jsonb.generator;
 
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
 
 import static io.avaje.jsonb.generator.APContext.typeElement;
 import static io.avaje.jsonb.generator.APContext.logError;
@@ -79,7 +82,6 @@ static String shortType(String fullType) {
   /** Trim off annotations from the raw type if present. */
   public static String trimAnnotations(String input) {
     input = COMMA_PATTERN.matcher(input).replaceAll(",");
-
     return cutAnnotations(input);
   }
 
@@ -95,7 +97,6 @@ private static String cutAnnotations(String input) {
       currentIndex = matcher.start();
     }
     final var result = input.substring(0, pos) + input.substring(currentIndex + 1);
-
     return cutAnnotations(result);
   }
 
@@ -168,21 +169,17 @@ static String baseTypeOfAdapter(String adapterFullName) {
   }
 
   static String baseTypeOfAdapter(TypeElement element) {
-
     return element.getInterfaces().stream()
-        .filter(t -> t.toString().contains("io.avaje.jsonb.JsonAdapter"))
-        .findFirst()
-        .map(Object::toString)
-        .map(GenericType::parse)
-        .map(GenericType::firstParamType)
-        .map(Util::extractTypeWithNest)
-        .orElseGet(
-            () -> {
-              logError(
-                  element,
-                  "Custom Adapters must implement JsonAdapter");
-              return "Invalid";
-            });
+      .filter(t -> t.toString().contains("io.avaje.jsonb.JsonAdapter"))
+      .findFirst()
+      .map(Object::toString)
+      .map(GenericType::parse)
+      .map(GenericType::firstParamType)
+      .map(Util::extractTypeWithNest)
+      .orElseGet(() -> {
+        logError(element, "Custom Adapters must implement JsonAdapter");
+        return "Invalid";
+      });
   }
 
   static String extractTypeWithNest(String fullType) {
@@ -208,4 +205,19 @@ static String extractTypeWithNest(String fullType) {
       return result.toString();
     }
   }
+
+  static boolean isPublic(Element element) {
+    var mods = element.getModifiers();
+    if (mods.contains(Modifier.PUBLIC)) {
+      return true;
+    }
+    if (mods.contains(Modifier.PRIVATE) || mods.contains(Modifier.PROTECTED)) {
+      return false;
+    }
+    boolean isImported = ProcessingContext.isImported(element);
+    if (element instanceof VariableElement) {
+      return !isImported && !mods.contains(Modifier.FINAL);
+    }
+    return !isImported;
+  }
 }

jsonb-generator/src/test/java/io/avaje/jsonb/generator/ProcessorTest.java renamed to jsonb-generator/src/test/java/io/avaje/jsonb/generator/JsonbProcessorTest.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-class ProcessorTest {
+class JsonbProcessorTest {
 
   @AfterEach
   void deleteGeneratedFiles() throws IOException {