Merge pull request #795 from SentryMan/duplicateTypes

Fix duplicate short names in Module Generation

Author: SentryMan

blackbox-test-inject/src/main/java/org/example/myapp/duplicate/SameType.java

@@ -0,0 +1,9 @@
+package org.example.myapp.duplicate;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class SameType {
+  @Singleton
+  public static class Inner {}
+}

blackbox-test-inject/src/main/java/org/example/myapp/duplicate/two/SameType.java

@@ -0,0 +1,9 @@
+package org.example.myapp.duplicate.two;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class SameType {
+  @Singleton
+  public static class Inner {}
+}

blackbox-test-inject/src/test/java/org/example/myapp/duplicate/SameTypeTest.java

@@ -0,0 +1,26 @@
+package org.example.myapp.duplicate;
+
+import io.avaje.inject.BeanScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+class SameTypeTest {
+
+  @Test
+  void testDuplicateShortName() {
+    try (BeanScope testScope = BeanScope.builder().build()) {
+
+      var sameType = testScope.get(SameType.class);
+      var sameTypeInner = testScope.get(SameType.Inner.class);
+      var sameType2 = testScope.get(org.example.myapp.duplicate.two.SameType.class);
+      var sameType2Inner = testScope.get(org.example.myapp.duplicate.two.SameType.Inner.class);
+
+      assertThat(sameType).isNotNull();
+      assertThat(sameTypeInner).isNotNull();
+      assertThat(sameType2).isNotNull();
+      assertThat(sameType2Inner).isNotNull();
+    }
+  }
+}

inject-generator/src/main/java/io/avaje/inject/generator/MetaData.java

@@ -222,7 +222,7 @@ void addImportTypes(Set<String> importTypes) {
     }
   }
 
-  void buildMethod(Append append) {
+  void buildMethod(Append append, boolean fullyQualify) {
     if (generateProxy) {
       return;
     }
@@ -273,7 +273,7 @@ void buildMethod(Append append) {
     if (hasMethod()) {
       append.append("    ").append(Util.shortMethod(method)).append("(builder");
     } else {
-      append.append("    ").append(shortType).append(Constants.DI).append(".build(builder");
+      append.append("    ").append(fullyQualify ? type : shortType).append(Constants.DI).append(".build(builder");
     }
     append.append(");").append(NEWLINE);
     append.append("  }").append(NEWLINE);

inject-generator/src/main/java/io/avaje/inject/generator/SimpleModuleWriter.java

@@ -3,14 +3,17 @@
 import static io.avaje.inject.generator.APContext.logError;
 import static io.avaje.inject.generator.APContext.typeElement;
 import static io.avaje.inject.generator.ProcessingContext.createMetaInfWriterFor;
+import static java.util.stream.Collectors.toSet;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Stream;
 
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -52,6 +55,7 @@ final class SimpleModuleWriter {
   private final String fullName;
   private final ScopeInfo scopeInfo;
   private final MetaDataOrdering ordering;
+  private final Set<String> duplicateTypes;
 
   private Append writer;
 
@@ -61,6 +65,13 @@ final class SimpleModuleWriter {
     this.modulePackage = scopeInfo.modulePackage();
     this.shortName = scopeInfo.moduleShortName();
     this.fullName = scopeInfo.moduleFullName();
+    final Set<String> seen = new HashSet<>();
+    this.duplicateTypes =
+      ordering.ordered().stream()
+        .map(MetaData::type)
+        .filter(t -> !seen.add(ProcessorUtils.shortType(t)))
+        .flatMap(t -> Stream.of(t, t + "$DI"))
+        .collect(toSet());
   }
 
   void write(ScopeInfo.Type scopeType) throws IOException {
@@ -183,7 +194,7 @@ private void writeBuildMethod() {
 
   private void writeBuildMethods() {
     for (MetaData metaData : ordering.ordered()) {
-      metaData.buildMethod(writer);
+      metaData.buildMethod(writer, duplicateTypes.contains(metaData.type()));
     }
   }
 
@@ -192,8 +203,9 @@ private void writePackage() {
     for (String type : factoryImportTypes()) {
       writer.append("import %s;", type).eol();
     }
+
     for (String type : scopeInfo.initModuleDependencies(ordering.importTypes())) {
-      if (Util.validImportType(type, modulePackage)) {
+      if (!duplicateTypes.contains(type) && Util.validImportType(type, modulePackage)) {
         writer.append("import %s;", type).eol();
       }
     }

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/duplicate/SameType.java

@@ -0,0 +1,9 @@
+package io.avaje.inject.generator.models.valid.duplicate;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class SameType {
+  @Singleton
+  public static class Inner {}
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/duplicate/two/SameType.java

@@ -0,0 +1,9 @@
+package io.avaje.inject.generator.models.valid.duplicate.two;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class SameType {
+  @Singleton
+  public static class Inner {}
+}