Merge pull request #636 from SentryMan/import-filter

SentryMan · web-flow · commit a57f5828c1d5 · 2024-07-04T01:57:25.000-04:00
Update Generated Imports
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/AssistBeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/AssistBeanReader.java
@@ -140,12 +140,8 @@ void buildRegister(Append writer) {
   }
 
   private Set<String> importTypes() {
-    importTypes.add("io.avaje.inject.AssistFactory");
     Optional.ofNullable(targetType).ifPresent(t -> importTypes.add(t.getQualifiedName().toString()));
 
-    if (Util.validImportType(type)) {
-      importTypes.add(type);
-    }
     if (qualifierName != null) {
       importTypes.add(NamedPrism.PRISM_TYPE);
     }
@@ -159,13 +155,13 @@ private Set<String> importTypes() {
     return importTypes.forImport();
   }
 
-  void writeImports(Append writer) {
+  void writeImports(Append writer, String pkgName) {
     importTypes.add(Constants.COMPONENT);
     if (!injectFields().isEmpty()) {
       importTypes.add(Constants.TYPE);
     }
     for (String importType : importTypes()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, pkgName)) {
         writer.append("import %s;", Util.sanitizeImports(importType)).eol();
       }
     }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -346,9 +346,7 @@ private void lifeCycleNotSupported(String lifecycle) {
   }
 
   private Set<String> importTypes() {
-    if (Util.validImportType(type)) {
-      importTypes.add(type);
-    }
+    importTypes.add(type);
     typeReader.extraImports(importTypes);
     requestParams.addImports(importTypes);
     aspects.extraImports(importTypes);
@@ -365,7 +363,7 @@ private Set<String> importTypes() {
     if (!suppressGeneratedImport){
       importTypes.add(Constants.GENERATED);
     }
-    if (!suppressBuilderImport) {
+    if (!suppressBuilderImport && !isGenerateProxy()) {
       importTypes.add(Constants.BUILDER);
     }
     return importTypes.forImport();
@@ -384,13 +382,13 @@ String generatedType() {
     return suppressGeneratedImport ? "@io.avaje.inject.spi.Generated" : "@Generated";
   }
 
-  void writeImports(Append writer) {
+  void writeImports(Append writer, String pkgName) {
     if (!allGenericTypes().isEmpty()) {
       importTypes.add(Constants.TYPE);
       importTypes.add(Constants.GENERICTYPE);
     }
     for (String importType : importTypes()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, pkgName)) {
         writer.append("import %s;", Util.sanitizeImports(importType)).eol();
       }
     }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/EventPublisherWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/EventPublisherWriter.java
@@ -19,7 +19,7 @@
 /** Write the source code for the bean. */
 final class EventPublisherWriter {
   private static final Map<String, String> GENERATED_PUBLISHERS = new HashMap<>();
-  private final String TEMPLATE =
+  private static final String TEMPLATE =
       "package {0};\n\n"
           + "{1}"
           + "@Component\n"
@@ -131,7 +131,7 @@ String imports() {
 
     StringBuilder writer = new StringBuilder();
     for (String importType : importTypes.forImport()) {
-      if (Util.validImportType(importType)) {
+      if (Util.validImportType(importType, packageName)) {
         writer.append(String.format("import %s;\n", Util.sanitizeImports(importType)));
       }
     }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleAssistWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleAssistWriter.java
@@ -72,7 +72,7 @@ private void writePackage() {
   }
 
   private void writeImports() {
-    beanReader.writeImports(writer);
+    beanReader.writeImports(writer, packageName);
   }
 
   private void writeClassStart() {
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleBeanProxyWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleBeanProxyWriter.java
@@ -95,7 +95,7 @@ private void writeImports() {
     writer.append("import %s;", Constants.INVOCATION_EXCEPTION).eol();
     writer.append("import %s;", Constants.METHOD_INTERCEPTOR).eol();
     writer.append("import %s;", Constants.PROXY).eol();
-    beanReader.writeImports(writer);
+    beanReader.writeImports(writer, packageName);
   }
 
   private void writeClassEnd() {
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleBeanWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleBeanWriter.java
@@ -325,7 +325,7 @@ private void writeMethodParams(String builderRef, MethodReader methodReader) {
   }
 
   private void writeImports() {
-    beanReader.writeImports(writer);
+    beanReader.writeImports(writer, packageName);
   }
 
   private void writeClassEnd() {
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleModuleWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleModuleWriter.java
@@ -194,7 +194,7 @@ private void writePackage() {
       writer.append("import %s;", type).eol();
     }
     for (String type : scopeInfo.initModuleDependencies(ordering.importTypes())) {
-      if (Util.validImportType(type)) {
+      if (Util.validImportType(type, modulePackage)) {
         writer.append("import %s;", type).eol();
       }
     }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java
@@ -1,14 +1,8 @@
 package io.avaje.inject.generator;
 
-import static io.avaje.inject.generator.APContext.logError;
-import static io.avaje.inject.generator.ProcessingContext.createMetaInfWriterFor;
-
 import java.io.IOException;
-import java.io.Writer;
 import java.util.Set;
 
-import javax.tools.FileObject;
-
 /** Write the source code for the factory. */
 final class SimpleOrderWriter {
 
@@ -44,7 +38,6 @@ private void writePackage() {
     writer
       .append(
         "import static java.util.Map.entry;\n"
-          + "import static java.util.List.of;\n"
           + "\n"
           + "import java.util.List;\n"
           + "import java.util.Map;\n"
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
@@ -6,6 +6,7 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 final class Util {
@@ -24,8 +25,19 @@ static boolean isVoid(String type) {
     return "void".equalsIgnoreCase(type);
   }
 
-  static boolean validImportType(String type) {
-    return type.indexOf('.') > 0;
+  static boolean validImportType(String type, String packageName) {
+    return type.indexOf('.') > -1
+      && !type.startsWith("java.lang.")
+      && importDifferentPackage(type, packageName)
+      || importJavaLangSubpackage(type);
+  }
+
+  private static boolean importDifferentPackage(String type, String packageName) {
+    return type.replace(packageName + '.', "").indexOf('.') > -1;
+  }
+
+  private static boolean importJavaLangSubpackage(String type) {
+    return type.startsWith("java.lang.") && importDifferentPackage(type, "java.lang");
   }
 
   static String classOfMethod(String method) {
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java b/inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java
@@ -98,15 +98,16 @@ void addForInterface() {
 
   @Test
   void validImportType() {
-    assertTrue(Util.validImportType("my.Foo"));
-    assertTrue(Util.validImportType("other.pack.Foo"));
+    assertTrue(Util.validImportType("java.lang.something.Foo", "org.foo"));
+    assertTrue(Util.validImportType("org.foo.some.Bar", "org.foo"));
+    assertTrue(Util.validImportType("org.other.Bar", "org.foo"));
   }
 
   @Test
   void validImportType_not() {
-    assertFalse(Util.validImportType("void"));
-    assertFalse(Util.validImportType("Foo"));
-    assertFalse(Util.validImportType("NoPackage"));
+    assertFalse(Util.validImportType("int", "org.foo"));
+    assertFalse(Util.validImportType("java.lang.Integer", "org.foo"));
+    assertFalse(Util.validImportType("org.foo.Bar", "org.foo"));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -140,12 +140,8 @@ void buildRegister(Append writer) {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`private Set<String> importTypes() {`
`143`		`- importTypes.add("io.avaje.inject.AssistFactory");`
`144`	`143`	`Optional.ofNullable(targetType).ifPresent(t -> importTypes.add(t.getQualifiedName().toString()));`
`145`	`144`
`146`		`- if (Util.validImportType(type)) {`
`147`		`- importTypes.add(type);`
`148`		`- }`
`149`	`145`	`if (qualifierName != null) {`
`150`	`146`	`importTypes.add(NamedPrism.PRISM_TYPE);`
`151`	`147`	`}`
`@@ -159,13 +155,13 @@ private Set<String> importTypes() {`
`159`	`155`	`return importTypes.forImport();`
`160`	`156`	`}`
`161`	`157`
`162`		`- void writeImports(Append writer) {`
	`158`	`+ void writeImports(Append writer, String pkgName) {`
`163`	`159`	`importTypes.add(Constants.COMPONENT);`
`164`	`160`	`if (!injectFields().isEmpty()) {`
`165`	`161`	`importTypes.add(Constants.TYPE);`
`166`	`162`	`}`
`167`	`163`	`for (String importType : importTypes()) {`
`168`		`- if (Util.validImportType(importType)) {`
	`164`	`+ if (Util.validImportType(importType, pkgName)) {`
`169`	`165`	`writer.append("import %s;", Util.sanitizeImports(importType)).eol();`
`170`	`166`	`}`
`171`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,9 +346,7 @@ private void lifeCycleNotSupported(String lifecycle) {`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`private Set<String> importTypes() {`
`349`		`- if (Util.validImportType(type)) {`
`350`		`- importTypes.add(type);`
`351`		`- }`
	`349`	`+ importTypes.add(type);`
`352`	`350`	`typeReader.extraImports(importTypes);`
`353`	`351`	`requestParams.addImports(importTypes);`
`354`	`352`	`aspects.extraImports(importTypes);`
`@@ -365,7 +363,7 @@ private Set<String> importTypes() {`
`365`	`363`	`if (!suppressGeneratedImport){`
`366`	`364`	`importTypes.add(Constants.GENERATED);`
`367`	`365`	`}`
`368`		`- if (!suppressBuilderImport) {`
	`366`	`+ if (!suppressBuilderImport && !isGenerateProxy()) {`
`369`	`367`	`importTypes.add(Constants.BUILDER);`
`370`	`368`	`}`
`371`	`369`	`return importTypes.forImport();`
`@@ -384,13 +382,13 @@ String generatedType() {`
`384`	`382`	`return suppressGeneratedImport ? "@io.avaje.inject.spi.Generated" : "@Generated";`
`385`	`383`	`}`
`386`	`384`
`387`		`- void writeImports(Append writer) {`
	`385`	`+ void writeImports(Append writer, String pkgName) {`
`388`	`386`	`if (!allGenericTypes().isEmpty()) {`
`389`	`387`	`importTypes.add(Constants.TYPE);`
`390`	`388`	`importTypes.add(Constants.GENERICTYPE);`
`391`	`389`	`}`
`392`	`390`	`for (String importType : importTypes()) {`
`393`		`- if (Util.validImportType(importType)) {`
	`391`	`+ if (Util.validImportType(importType, pkgName)) {`
`394`	`392`	`writer.append("import %s;", Util.sanitizeImports(importType)).eol();`
`395`	`393`	`}`
`396`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ private void writePackage() {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private void writeImports() {`
`75`		`- beanReader.writeImports(writer);`
	`75`	`+ beanReader.writeImports(writer, packageName);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`private void writeClassStart() {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private void writeImports() {`
`95`	`95`	`writer.append("import %s;", Constants.INVOCATION_EXCEPTION).eol();`
`96`	`96`	`writer.append("import %s;", Constants.METHOD_INTERCEPTOR).eol();`
`97`	`97`	`writer.append("import %s;", Constants.PROXY).eol();`
`98`		`- beanReader.writeImports(writer);`
	`98`	`+ beanReader.writeImports(writer, packageName);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private void writeClassEnd() {`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ private void writeMethodParams(String builderRef, MethodReader methodReader) {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`private void writeImports() {`
`328`		`- beanReader.writeImports(writer);`
	`328`	`+ beanReader.writeImports(writer, packageName);`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`private void writeClassEnd() {`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ private void writePackage() {`
`194`	`194`	`writer.append("import %s;", type).eol();`
`195`	`195`	`}`
`196`	`196`	`for (String type : scopeInfo.initModuleDependencies(ordering.importTypes())) {`
`197`		`- if (Util.validImportType(type)) {`
	`197`	`+ if (Util.validImportType(type, modulePackage)) {`
`198`	`198`	`writer.append("import %s;", type).eol();`
`199`	`199`	`}`
`200`	`200`	`}`