Allows package-private Classes/Fields/Getters (#222)

* Allows package-private classes/fields/getters/

* Update Util.java

* use modules to determine import status

* Update Util.java

Author: SentryMan

validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java

@@ -9,8 +9,9 @@ final class AdapterName {
   final String fullName;
 
   AdapterName(TypeElement origin) {
-    final String originName = origin.getQualifiedName().toString();
-    final String name = origin.getSimpleName().toString();
+
+    String originName = origin.getQualifiedName().toString();
+    String name = origin.getSimpleName().toString();
     String originPackage = ProcessorUtils.packageOf(originName);
     if (origin.getNestingKind().isNested()) {
       final String parent = Util.shortName(originPackage);
@@ -19,7 +20,12 @@ final class AdapterName {
     } else {
       shortName = name;
     }
-    this.adapterPackage = "".equals(originPackage) ? "valid" : originPackage + ".valid";
+    if ("".equals(originPackage)) {
+      this.adapterPackage = "valid";
+    } else {
+      this.adapterPackage =
+          ProcessingContext.isImported(origin) ? originPackage + ".valid" : originPackage;
+    }
     this.fullName = adapterPackage + "." + shortName + "ValidationAdapter";
   }
 

validator-generator/src/main/java/io/avaje/validation/generator/FieldReader.java

@@ -33,7 +33,7 @@ final class FieldReader {
   FieldReader(Element element, List<String> genericTypeParams, boolean classLevel) {
     this.genericTypeParams = genericTypeParams;
     this.fieldName = element.getSimpleName().toString();
-    this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
+    this.publicField = Util.isPublic(element);
     this.element = element;
     this.elementAnnotations = ElementAnnotationContainer.create(element);
     this.genericType = elementAnnotations.genericType();
@@ -141,7 +141,9 @@ private void writeGetValue(Append writer, String suffix) {
     } else {
       logError(
           element,
-          "Field" + fieldName + " is inaccessible. Add a getter or make the field public.");
+          "Field"
+              + fieldName
+              + " is inaccessible. Add a getter or make the field package-private/public.");
     }
   }
 

validator-generator/src/main/java/io/avaje/validation/generator/MethodReader.java

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

validator-generator/src/main/java/io/avaje/validation/generator/ProcessingContext.java

@@ -11,13 +11,14 @@
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
 import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
+
 import io.avaje.validation.generator.ModuleInfoReader.Requires;
 
 final class ProcessingContext {
@@ -59,6 +60,11 @@ static String diAnnotation() {
     return CTX.get().diAnnotation;
   }
 
+  static boolean isImported(Element element) {
+    var moduleName = APContext.getProjectModuleElement().getQualifiedName();
+    return !APContext.elements().getModuleOf(element).getQualifiedName().contentEquals(moduleName);
+  }
+
   static void validateModule() {
     var module = getProjectModuleElement();
     if (module != null && !module.isUnnamed()) {

validator-generator/src/main/java/io/avaje/validation/generator/TypeReader.java

@@ -97,7 +97,7 @@ private boolean includeField(Element element) {
 
   private void readMethod(Element element, TypeElement type, List<FieldReader> localFields) {
     final ExecutableElement methodElement = (ExecutableElement) element;
-    if (methodElement.getModifiers().contains(Modifier.PUBLIC)) {
+    if (Util.isPublic(methodElement)) {
       final List<? extends VariableElement> parameters = methodElement.getParameters();
       final String methodKey = methodElement.getSimpleName().toString();
       final MethodReader methodReader = new MethodReader(methodElement, type).read();

validator-generator/src/main/java/io/avaje/validation/generator/Util.java

@@ -1,30 +1,22 @@
 package io.avaje.validation.generator;
 
+import static io.avaje.validation.generator.APContext.logError;
 import static io.avaje.validation.generator.APContext.typeElement;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.lang.model.element.AnnotationMirror;
 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 javax.lang.model.type.TypeMirror;
 
-import static io.avaje.validation.generator.APContext.logError;
-
 final class Util {
 
-  private static final Pattern WHITE_SPACE_REGEX =
-      Pattern.compile("\\s+(?=([^\"]*\"[^\"]*\")*[^\"]*$)");
-  private static final Pattern COMMA_PATTERN =
-      Pattern.compile(", (?=(?:[^\\\"]*\\\"[^\\\"]*\\\")*[^\\\"]*$)");
-
   static final Pattern mapSplitString = Pattern.compile("\\s[A-Za-z0-9]+,|,");
   static final Set<String> BASIC_TYPES = Set.of("java.lang.String", "java.math.BigDecimal");
 
@@ -157,4 +149,18 @@ static boolean isBasicType(final String topType) {
         || topType.startsWith("java.time.")
         || GenericTypeMap.typeOfRaw(topType) != null;
   }
+
+  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;
+    }
+    var isImported = ProcessingContext.isImported(element);
+
+    return !isImported;
+  }
 }

validator-generator/src/main/java/io/avaje/validation/generator/ValidationProcessor.java

@@ -46,7 +46,6 @@ public final class ValidationProcessor extends AbstractProcessor {
   private final ComponentMetaData metaData = new ComponentMetaData();
   private final List<BeanReader> allReaders = new ArrayList<>();
   private final Set<String> sourceTypes = new HashSet<>();
-  private final Set<String> mixInImports = new HashSet<>();
   private final Set<String> alreadyGenerated = new HashSet<>();
   private SimpleComponentWriter componentWriter;
   private boolean readModuleInfo;
@@ -205,10 +204,6 @@ private void writeAdaptersForImported(Set<? extends Element> importedElements) {
     for (final var importedElement : ElementFilter.typesIn(importedElements)) {
       for (final TypeMirror importType :
           ImportValidPojoPrism.getInstanceOn(importedElement).value()) {
-        // if imported by mixin annotation skip
-        if (mixInImports.contains(importType.toString())) {
-          continue;
-        }
         writeAdapterForType(asTypeElement(importType));
       }
     }

validator-generator/src/test/java/io/avaje/validation/generator/models/valid/PackagePrivateTestClass.java

@@ -0,0 +1,51 @@
+package io.avaje.validation.generator.models.valid;
+
+import java.util.List;
+
+import javax.validation.constraints.Negative;
+import javax.validation.constraints.NotEmpty;
+
+import io.avaje.lang.Nullable;
+import io.avaje.validation.constraints.Pattern;
+import io.avaje.validation.constraints.RegexFlag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+@Valid
+class PackagePrivateTestClass {
+
+  @NotNull
+  @NotBlank(message = "blankLmao")
+  String alias;
+
+  @Nullable String s;
+
+  int i;
+  @NotNull Integer integer;
+
+  char ch;
+  @NotNull Character chara;
+
+  @NotEmpty List<String> list;
+
+  @Pattern(
+      regexp = "ded",
+      flags = {RegexFlag.CANON_EQ, RegexFlag.CASE_INSENSITIVE})
+  String getS() {
+    return s;
+  }
+
+  @Negative(message = "message")
+  int getI() {
+    return i;
+  }
+
+  List<String> getList() {
+    return list;
+  }
+
+  void setList(List<String> list) {
+    this.list = list;
+  }
+}