From f1cd6cead71faa3f6eefb57d8790bd7dba9f99b2 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 16 Sep 2015 17:05:11 +0200 Subject: [PATCH] [#4567] Import also nested generic types of generated code --- jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java index 6aab1b5e7b..301314d4f5 100644 --- 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 { 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); } } }