Merge pull request #149 from SentryMan/innerConflict

Lengthen Inner Type Short Names

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/UType.java

@@ -132,7 +132,7 @@ public String shortType() {
 
     @Override
     public String shortName() {
-      return Util.initLower(shortType());
+      return Util.initLower(shortType()).replace(".", "$");
     }
 
     @Override
@@ -202,12 +202,36 @@ public Set<String> importTypes() {
       Set<String> set = new LinkedHashSet<>();
       for (String type : allTypes) {
         if (!type.startsWith("java.lang.") && type.indexOf('.') > -1) {
-          set.add(type.replace("[]", ""));
+          if (type.startsWith("java")) set.add(type.replace("[]", ""));
+          else set.add(innerTypesImport(type).replace("[]", ""));
         }
       }
       return set;
     }
 
+    public String innerTypesImport(String type) {
+
+      final var parts = type.split("\\.");
+      var result = "";
+      var foundUpper = false;
+
+      for (var i = 0; i < parts.length; i++) {
+        if (!Character.isUpperCase(parts[i].charAt(0))) {
+          result += parts[i] + ".";
+        } else if (!foundUpper) {
+          foundUpper = true;
+          result += parts[i] + (i == parts.length - 1 ? "" : ".");
+        } else {
+          break;
+        }
+      }
+
+      if (result.endsWith(".")) {
+        result = result.substring(0, result.length() - 1);
+      }
+      return result;
+    }
+
     @Override
     public boolean isGeneric() {
       return true;
@@ -232,7 +256,7 @@ public String shortType() {
 
     @Override
     public String shortName() {
-      return shortName;
+      return shortName.replace(".", "$");
     }
 
     @Override

http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java

@@ -75,8 +75,18 @@ public static String shortName(String fullType) {
     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;
     }
   }