Merge pull request #43 from SentryMan/java-lang-imports

Fix Java Lang Sub-Package Imports

Author: rbygrave

prism-core/src/main/java/io/avaje/prism/internal/UTypeWriter.java

@@ -15,11 +15,13 @@ public static void write(PrintWriter out, String packageName) {
             + "import java.util.List;\n"
             + "import java.util.Set;\n"
             + "\n"
+            + "import javax.annotation.processing.Generated;\n"
             + "import javax.lang.model.element.AnnotationMirror;\n"
             + "import javax.lang.model.type.TypeKind;\n"
             + "import javax.lang.model.type.TypeMirror;\n"
             + "\n"
             + "/** Utility type to help process {@link TypeMirror}s */\n"
+            + "@Generated(\"avaje-prism-generator\")\n"
             + "public interface UType {\n"
             + "\n"
             + "  /**\n"

prism-core/src/main/java/io/avaje/prism/internal/VisitorWriter.java

@@ -12,8 +12,6 @@ public static void write(PrintWriter out, String packageName) {
             + packageName
             + ";\n"
             + "\n"
-            + "\n"
-            + "import static java.util.function.Predicate.not;\n"
             + "import static java.util.stream.Collectors.toSet;\n"
             + "\n"
             + "import java.util.ArrayList;\n"
@@ -25,6 +23,7 @@ public static void write(PrintWriter out, String packageName) {
             + "import java.util.Map;\n"
             + "import java.util.Set;\n"
             + "\n"
+            + "import javax.annotation.processing.Generated;\n"
             + "import javax.lang.model.element.AnnotationMirror;\n"
             + "import javax.lang.model.element.Element;\n"
             + "import javax.lang.model.element.QualifiedNameable;\n"
@@ -44,6 +43,7 @@ public static void write(PrintWriter out, String packageName) {
             + "import javax.lang.model.type.WildcardType;\n"
             + "import javax.lang.model.util.AbstractTypeVisitor9;\n"
             + "\n"
+            + "@Generated(\"avaje-prism-generator\")\n"
             + "class TypeMirrorVisitor extends AbstractTypeVisitor9<StringBuilder, StringBuilder>\n"
             + "    implements UType {\n"
             + "\n"
@@ -62,26 +62,35 @@ public static void write(PrintWriter out, String packageName) {
             + "  private TypeKind kind;\n"
             + "\n"
             + "  public static TypeMirrorVisitor create(TypeMirror typeMirror) {\n"
-            + "    final var v = new TypeMirrorVisitor(1, Map.of());\n"
+            + "    return create(typeMirror, true);\n"
+            + "  }\n"
+            + "\n"
+            + "  public static TypeMirrorVisitor create(TypeMirror typeMirror, boolean includedAnnotations) {\n"
+            + "    final var v = new TypeMirrorVisitor(1, Map.of(), includedAnnotations);\n"
             + "    final StringBuilder b = new StringBuilder();\n"
             + "    v.fullType = typeMirror.accept(v, b).toString();\n"
             + "    return v;\n"
             + "  }\n"
             + "\n"
             + "  private TypeMirrorVisitor() {\n"
-            + "    this(1, new HashMap<>());\n"
+            + "    this(1, new HashMap<>(), true);\n"
             + "  }\n"
             + "\n"
-            + "  private TypeMirrorVisitor(int depth, Map<TypeVariable, String> typeVariables) {\n"
-            + "    this.includeAnnotations = true;\n"
+            + "  private TypeMirrorVisitor(\n"
+            + "      int depth, Map<TypeVariable, String> typeVariables, boolean includeAnnotations) {\n"
+            + "    this.includeAnnotations = includeAnnotations;\n"
             + "    this.depth = depth;\n"
             + "    this.typeVariables = new HashMap<>();\n"
             + "    this.typeVariables.putAll(typeVariables);\n"
             + "  }\n"
             + "\n"
             + "  @Override\n"
             + "  public Set<String> importTypes() {\n"
-            + "    return allTypes.stream().filter(s -> !s.startsWith(\"java.lang.\")).collect(toSet());\n"
+            + "    return allTypes.stream().filter(this::notJavaLang).collect(toSet());\n"
+            + "  }\n"
+            + "\n"
+            + "  private boolean notJavaLang(String type) {\n"
+            + "    return !type.startsWith(\"java.lang.\") || Character.isLowerCase(type.charAt(10));\n"
             + "  }\n"
             + "\n"
             + "  @Override\n"
@@ -151,7 +160,7 @@ public static void write(PrintWriter out, String packageName) {
             + "\n"
             + "  private void child(TypeMirror ct, StringBuilder p, boolean setMain) {\n"
             + "\n"
-            + "    var child = new TypeMirrorVisitor(depth + 1, typeVariables);\n"
+            + "    var child = new TypeMirrorVisitor(depth + 1, typeVariables, includeAnnotations);\n"
             + "    child.allTypes = allTypes;\n"
             + "    child.everyAnnotation = everyAnnotation;\n"
             + "    var full = ct.accept(child, new StringBuilder()).toString();\n"