[#4567] Import also nested generic types of generated code

2015-09-16 17:05:11 +02:00 · 2015-09-16 17:05:11 +02:00 · f1cd6cead7
commit f1cd6cead7
parent 7c4df876c1
1 changed files with 7 additions and 1 deletions
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
@ -190,7 +190,13 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {

                                unqualifiedTypes.put(unqualifiedType, qualifiedType);
                                qualifiedTypes.add(qualifiedType);
-                                c = remainder + m.group(2);
+                                String generic = m.group(2);
+
+                                // Consider importing generic type arguments, recursively
+                                c = remainder
+                                  + (generic.startsWith("<") || generic.startsWith("[")
+                                  ?  generic.substring(0, 1) + ref(generic.substring(1, generic.length() - 1)) + generic.substring(generic.length() - 1)
+                                  :  generic);
                            }
                        }
                    }