update generated imports

avaje · Jul 3, 2024 · a1c536a · a1c536a
1 parent aeb2d9a
commit a1c536a
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
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