nested short type

Author: SentryMan

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

@@ -371,7 +371,7 @@ void writeRequestCreate(Append writer) {
     for (FieldReader field : injectFields) {
       field.writeRequestInject(writer);
     }
-    for (MethodReader method : injectMethods) {
+    for (final MethodReader method : injectMethods) {
       writer.append("    bean.%s(", method.name());
       method.writeRequestConstructor(writer);
       writer.append(");").eol();
@@ -411,11 +411,7 @@ boolean hasConditions() {
   }
 
   String shortName() {
-    if (beanType.getNestingKind().isNested()) {
-      return Util.nestedShortName(beanQualifiedName());
-    } else {
-      return Util.shortName(beanQualifiedName());
-    }
+    return Util.shortName(beanQualifiedName());
   }
 
   String packageName() {

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

@@ -47,10 +47,10 @@ void addImports(ImportTypeMap importTypes) {
   }
 
   String builderGetDependency(String builder) {
-    StringBuilder sb = new StringBuilder();
+    final var sb = new StringBuilder();
     sb.append(builder).append(".").append(utype.getMethod(nullable, isBeanMap));
     if (isGenericParam()) {
-      sb.append("TYPE_").append(type.shortName());
+      sb.append("TYPE_").append(type.shortName().replace(".", "_"));
     } else {
       sb.append(Util.shortName(fieldType)).append(".class");
     }

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

@@ -1,5 +1,7 @@
 package io.avaje.inject.generator;
 
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -26,21 +28,30 @@ boolean containsShortName(String suffix) {
     return mapByShortName.containsKey(suffix);
   }
 
-  /**
-   * Register the full type checking for unique short name and returning the short name to use.
-   */
+  /** Register the full type checking for unique short name and returning the short name to use. */
   String add(String fullType) {
-    String shortName = Util.shortName(fullType);
-    String existingFull = mapByShortName.get(shortName);
+    final String shortName = Util.shortName(fullType);
+    String fullTypeActual;
+    String shortNameActual;
+    final var index = shortName.lastIndexOf('.');
+    if (index != -1) {
+      shortNameActual = shortName.substring(0, index);
+      fullTypeActual = fullType.replace(shortName, shortNameActual);
+
+    } else {
+      fullTypeActual = fullType;
+      shortNameActual = shortName;
+    }
+    final String existingFull = mapByShortName.get(shortName);
     if (existingFull == null) {
-      mapByShortName.put(shortName, fullType);
+      mapByShortName.put(shortName, fullTypeActual);
       return shortName;
-    } else if (existingFull.equals(fullType)) {
+    } else if (existingFull.equals(fullTypeActual)) {
       // already existing
       return shortName;
     } else {
       // must use fully qualified type
-      return fullType;
+      return fullTypeActual;
     }
   }
 

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

@@ -14,8 +14,6 @@ final class MethodReader {
 
   private static final String CODE_COMMENT_BUILD_FACTORYBEAN = "  /**\n   * Create and register %s via factory bean method %s#%s().\n   */";
 
-  private static final Set<String> UNSAFE_SHORT_NAME = Set.of("Builder", "Generated");
-
   private final ExecutableElement element;
   private final String factoryType;
   private final String methodName;
@@ -398,11 +396,11 @@ void addDependsOnGeneric(Set<GenericType> set) {
     void builderGetDependency(Append writer, String builderName, boolean forFactory) {
       writer.append(builderName).append(".").append(utilType.getMethod(nullable, isBeanMap));
       if (!genericType.isGenericType()) {
-        writer.append(safeShortName(genericType.topType())).append(".class");
+        writer.append(Util.shortName(genericType.topType())).append(".class");
       } else if (isProvider()) {
         writer.append(providerParam()).append(".class");
       } else {
-        writer.append("TYPE_").append(genericType.shortName());
+        writer.append("TYPE_").append(genericType.shortName().replace(".", "_"));
       }
       if (named != null && !named.isEmpty()) {
         writer.append(",\"").append(named).append("\"");
@@ -420,14 +418,6 @@ void builderGetDependency(Append writer, String builderName, boolean forFactory)
       writer.append(")");
     }
 
-    private String safeShortName(String fullType) {
-      final String shortName = Util.shortName(fullType);
-      if (UNSAFE_SHORT_NAME.contains(shortName)) {
-        return fullType;
-      }
-      return shortName;
-    }
-
     private String providerParam() {
       return Util.shortName(Util.unwrapProvider(paramType));
     }

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

@@ -68,7 +68,7 @@ private void writeGenericTypeFields() {
     Set<GenericType> genericTypes = beanReader.allGenericTypes();
     if (!genericTypes.isEmpty()) {
       for (GenericType type : genericTypes) {
-        writer.append("  public static final Type TYPE_%s = new GenericType<", type.shortName());
+        writer.append("  public static final Type TYPE_%s = new GenericType<", type.shortName().replace(".", "_"));
         // use fully qualified types here rather than use type.writeShort(writer)
         writer.append(type.toString());
         writer.append(">(){}.type();").eol();

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

@@ -43,7 +43,7 @@ void addSimpleType(String classType) {
 
   private void addGenericType(GenericType genericType) {
     genericTypes.add(genericType);
-    types.add("TYPE_" + genericType.shortName());
+    types.add("TYPE_" + genericType.shortName().replace(".", "_"));
   }
 
   Set<GenericType> genericTypes() {

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

@@ -129,22 +129,22 @@ static String initLower(String name) {
     return sb.toString();
   }
 
-  static String nestedShortName(String fullType) {
-    int pos = fullType.lastIndexOf('.');
-    if (pos < 0) {
-      return fullType;
-    } else {
-      pos = fullType.lastIndexOf('.', pos - 1);
-      return pos < 0 ? fullType : fullType.substring(pos + 1);
-    }
-  }
-
   static String shortName(String fullType) {
     final int p = fullType.lastIndexOf('.');
     if (p == -1) {
       return fullType;
-    } else {
+    } else if (fullType.startsWith("java")) {
       return fullType.substring(p + 1);
+    } else {
+      var result = "";
+      var foundClass = false;
+      for (final String part : fullType.split("\\.")) {
+        if (foundClass || Character.isUpperCase(part.charAt(0))) {
+          foundClass = true;
+          result += (result.isEmpty() ? "" : ".") + part;
+        }
+      }
+      return result;
     }
   }
 

inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java

@@ -12,8 +12,7 @@ class UtilTest {
 
   @Test
   void nestedShortName() {
-    assertEquals(Util.nestedShortName("com.example.Foo.Bar"), "Foo.Bar");
-    assertEquals(Util.nestedShortName("com.example.foo.Bar"), "foo.Bar");
+    assertEquals(Util.shortName("com.example.Foo.Bar"), "Foo.Bar");
   }
 
   @Test

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/nested/A0.java

@@ -0,0 +1,9 @@
+package io.avaje.inject.generator.models.valid.nested;
+
+public interface A0 {
+
+  /** Builder name clash in generated code, use the full type for this in generated code */
+  interface Builder {
+
+  }
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/nested/A1.java

@@ -0,0 +1,13 @@
+package io.avaje.inject.generator.models.valid.nested;
+
+public interface A1 {
+
+  /** Builder name clash in generated code, use the full type for this in generated code */
+  interface Builder {
+
+  }
+
+  interface DSS {
+
+  }
+}