Filter package-private imports from generated code (#229)

* filter package-private imports

* remove star imports

Author: SentryMan

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

@@ -9,7 +9,7 @@ interface BeanReader {
 
   void read();
 
-  void writeImports(Append writer);
+  void writeImports(Append writer, String adapterPackage);
 
   void writeFields(Append writer);
 

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

@@ -80,19 +80,17 @@ public void read() {
   }
 
   private Set<String> importTypes() {
-    if (Util.validImportType(type)) {
-      importTypes.add(type);
-    }
+    importTypes.add(type);
     for (final FieldReader allField : allFields) {
       allField.addImports(importTypes);
     }
     return importTypes;
   }
 
   @Override
-  public void writeImports(Append writer) {
+  public void writeImports(Append writer, String adapterPackage) {
     for (final String importType : importTypes()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, adapterPackage)) {
         writer.append("import %s;", importType).eol();
       }
     }

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

@@ -80,19 +80,20 @@ List<TypeElement> allAnnotationAdapters() {
   Collection<String> allImports() {
     final Set<String> packageImports = new TreeSet<>();
     for (final String adapterFullName : allTypes) {
-      packageImports.add(ProcessorUtils.packageOf(adapterFullName) + ".*");
+      packageImports.add(adapterFullName);
       packageImports.add(ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));
     }
 
     for (final var adapter : annotationAdapters) {
       final var adapterFullName = adapter.getQualifiedName().toString();
-      packageImports.add(ProcessorUtils.packageOf(adapterFullName) + ".*");
-      packageImports.add(ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));
+      packageImports.add(adapterFullName);
+      packageImports.add(
+          ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));
 
       ConstraintAdapterPrism.getInstanceOn(adapter)
-        .value()
-        .toString()
-        .transform(packageImports::add);
+          .value()
+          .toString()
+          .transform(packageImports::add);
     }
 
     return packageImports;

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

@@ -90,18 +90,16 @@ public boolean hasValidationAnnotation() {
   public void read() {}
 
   private Set<String> importTypes() {
-    if (Util.validImportType(type)) {
-      importTypes.add(type);
-    }
+    importTypes.add(type);
 
     annotations.keySet().forEach(t -> importTypes.addAll(t.importTypes()));
     return importTypes;
   }
 
   @Override
-  public void writeImports(Append writer) {
+  public void writeImports(Append writer, String adapterPackage) {
     for (final String importType : importTypes()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, adapterPackage)) {
         writer.append("import %s;", importType).eol();
       }
     }

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

@@ -101,7 +101,7 @@ private void writeFields() {
   }
 
   private void writeImports() {
-    beanReader.writeImports(writer);
+    beanReader.writeImports(writer, adapterPackage);
   }
 
   private void writePackage() {

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

@@ -131,12 +131,13 @@ private void writeMetaDataEntry(List<String> entries) {
 
   private void writeImports() {
     importTypes.add(Constants.VALIDATOR);
-    importTypes.add(Constants.VALID_SPI);
     importTypes.add("io.avaje.validation.spi.GeneratedComponent");
+    importTypes.add("io.avaje.validation.spi.MetaData");
+    importTypes.add("io.avaje.validation.spi.Generated");
     importTypes.addAll(metaData.allImports());
 
     for (final String importType : importTypes) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, metaData.packageName())) {
         writer.append("import %s;", importType).eol();
       }
     }

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

@@ -53,7 +53,7 @@ void write() throws IOException {
   }
 
   private void writeImports() {
-    beanReader.writeImports(writer);
+    beanReader.writeImports(writer, adapterPackage);
   }
 
   private void writePackage() {

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

@@ -37,10 +37,12 @@ public static boolean isNullable(Element p) {
     return false;
   }
 
-  static boolean validImportType(String type) {
-    return type.indexOf('.') > 0 && !type.startsWith("java.lang.")
-      || (type.startsWith("java.lang.")
-      && type.replace("java.lang.", "").transform(s -> s.contains(".")));
+  static boolean validImportType(String type, String adapterPackage) {
+    return type.indexOf('.') > -1
+            && !type.startsWith("java.lang.")
+            && type.replace(adapterPackage + ".", "").transform(s -> s.contains("."))
+        || (type.startsWith("java.lang.")
+            && type.replace("java.lang.", "").transform(s -> s.contains(".")));
   }
 
   static String shortName(String fullType) {

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

@@ -44,17 +44,15 @@ public String shortName() {
   }
 
   private Set<String> importTypes() {
-    if (Util.validImportType(type)) {
-      importTypes.add(type);
-    }
+    importTypes.add(type);
     paramAnnotations.forEach(a -> a.addImports(importTypes));
     returnElementAnnotation.addImports(importTypes);
     return importTypes;
   }
 
-  public void writeImports(Append writer) {
+  public void writeImports(Append writer, String packageName) {
     for (final String importType : importTypes()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, packageName)) {
         writer.append("import %s;", importType).eol();
       }
     }