From 70929da1d0028b8352ded0ca106aff088bc27d7a Mon Sep 17 00:00:00 2001
From: Laurent SCHOELENS <laurent.schoelens@sfr.com>
Date: Mon, 27 Mar 2023 12:18:46 +0200
Subject: [PATCH] make some fixes after run on bigger project

---
 .../java/org/umlgraph/doclet/ClassGraph.java  | 40 +++++++++++++------
 .../java/org/umlgraph/doclet/Options.java     |  3 +-
 .../java/org/umlgraph/doclet/UmlGraphDoc.java |  2 +-
 .../org/umlgraph/doclet/util/ElementUtil.java | 28 +++++++++++--
 4 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
index 8acdc97..e9974f1 100644
--- a/src/main/java/org/umlgraph/doclet/ClassGraph.java
+++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java
@@ -57,8 +57,6 @@ import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.NoType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.TypeVariable;
-import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import javax.tools.JavaFileManager;
@@ -810,7 +808,9 @@ class ClassGraph {
         for (TypeMirror type : types) {
             // skip primitives and type variables, as well as dependencies
             // on the source class
-            if (type.getKind().isPrimitive() || type instanceof NoType || type instanceof WildcardType || type instanceof TypeVariable
+            if (type.getKind().isPrimitive()
+                    || ElementUtil.isType(type, TypeKind.TYPEVAR) || ElementUtil.isType(type, TypeKind.WILDCARD)
+                    || type instanceof NoType
                     || c.toString().equals(ElementUtil.getTypeElement(type).toString())) {
                 continue;
             }
@@ -856,10 +856,10 @@ class ClassGraph {
 
     private FieldRelationInfo getFieldRelationInfo(VariableElement field) {
         TypeMirror type = field.asType();
-        if (type.getKind().isPrimitive() || type.getKind() == TypeKind.WILDCARD || type.getKind() == TypeKind.TYPEVAR) {
+        if (type.getKind().isPrimitive() || ElementUtil.isType(type, TypeKind.WILDCARD) || ElementUtil.isType(type, TypeKind.TYPEVAR)) {
             return null;
         }
-
+        
         if (ElementUtil.dimensions(type).endsWith("[]")) {
             return new FieldRelationInfo(ElementUtil.getTypeElement(type), true);
         }
@@ -867,35 +867,49 @@ class ClassGraph {
         Options opt = optionProvider.getOptionsFor(docTrees, ElementUtil.getTypeElement(type));
         if (opt.matchesCollPackageExpression(ElementUtil.getQualifiedName(types, type))) {
             List<? extends TypeMirror> argTypes = getInterfaceTypeArguments(collectionClassDoc, type);
-            if (argTypes != null && argTypes.size() == 1 && !argTypes.get(0).getKind().isPrimitive()) {
-                return new FieldRelationInfo(ElementUtil.getTypeElement(argTypes.get(0)), true);
+            if (argTypes != null && argTypes.size() == 1 && !argTypes.get(0).getKind().isPrimitive() && !ElementUtil.isType(argTypes.get(0), TypeKind.TYPEVAR)) {
+                TypeMirror arg = argTypes.get(0);
+                return new FieldRelationInfo(ElementUtil.getTypeElement(arg), true);
             }
 
             argTypes = getInterfaceTypeArguments(mapClassDoc, type);
-            if (argTypes != null && argTypes.size() == 2 && !argTypes.get(1).getKind().isPrimitive()) {
-                return new FieldRelationInfo(ElementUtil.getTypeElement(argTypes.get(1)), true);
+            if (argTypes != null && argTypes.size() == 2 && !argTypes.get(1).getKind().isPrimitive() && !ElementUtil.isType(argTypes.get(1), TypeKind.TYPEVAR)) {
+                TypeMirror arg = argTypes.get(1);
+                return new FieldRelationInfo(ElementUtil.getTypeElement(arg), true);
             }
         }
 
         return new FieldRelationInfo(ElementUtil.getTypeElement(type), false);
     }
 
-    private List<? extends TypeMirror> getInterfaceTypeArguments(TypeElement iface, TypeMirror t) {
+    private List<? extends TypeMirror> getInterfaceTypeArguments(Element iface, TypeMirror t) {
         if (t instanceof DeclaredType) {
             DeclaredType pt = (DeclaredType) t;
             if (iface != null && iface.equals(pt.asElement())) {
                 return pt.getTypeArguments();
             } else {
-                for (TypeMirror pti : ElementUtil.getInterfacesTypes(iface)) {
+                for (TypeMirror pti : ElementUtil.getInterfacesTypes(pt.asElement())) {
                     List<? extends TypeMirror> result = getInterfaceTypeArguments(iface, pti);
                     if (result != null) {
                         return result;
                     }
                 }
-                if (ElementUtil.getSuperclassType(pt) != null) {
-                    return getInterfaceTypeArguments(iface, ElementUtil.getSuperclassType(pt));
+                TypeMirror superType = ElementUtil.getSuperclassType(pt);
+                if (superType != null && superType.getKind() != TypeKind.NONE) {
+                    return getInterfaceTypeArguments(iface, superType);
                 }
             }
+        } else if (iface instanceof TypeElement) {
+            for (TypeMirror pti : ElementUtil.getInterfacesTypes((TypeElement) iface)) {
+                List<? extends TypeMirror> result = getInterfaceTypeArguments(iface, pti);
+                if (result != null) {
+                    return result;
+                }
+            }
+            TypeElement superType = ElementUtil.getSuperclass((TypeElement) iface);
+            if (superType != null && superType.asType().getKind() != TypeKind.NONE) {
+                return getInterfaceTypeArguments(iface, superType.asType());
+            }
         }
         return null;
     }
diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java
index f5b4175..b5b9b77 100644
--- a/src/main/java/org/umlgraph/doclet/Options.java
+++ b/src/main/java/org/umlgraph/doclet/Options.java
@@ -1161,8 +1161,9 @@ public class Options implements Cloneable, OptionProvider {
     public boolean matchesCollPackageExpression(CharSequence s) {
         for (Pattern collPattern : collPackages) {
             Matcher m = collPattern.matcher(s);
-            if (strictMatching ? m.matches() : m.find())
+            if (strictMatching ? m.matches() : m.find()) {
                 return true;
+            }
         }
         return false;
     }
diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
index 6a8f796..93ec7d6 100644
--- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
+++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
@@ -129,7 +129,7 @@ public class UmlGraphDoc implements Doclet {
                 UmlGraph.buildGraph(reporter, root, opt, view, packageDoc);
                 runGraphviz(opt.dotExecutable, outputFolder, ElementUtil.getModuleOf(root, packageDoc), packageDoc.getQualifiedName(), packageDoc.getSimpleName(), reporter);
                 alterHtmlDocs(opt, outputFolder, ElementUtil.getModuleOf(root, packageDoc), packageDoc.getQualifiedName(), packageDoc.getSimpleName(), "package-summary.html",
-                        Pattern.compile("(</[Hh]2>)|(<h1 title=\"Package\").*"), reporter);
+                        Pattern.compile("(</[Hh]2>)|(<h1 title=\"Package( |\")).*"), reporter);
             }
         }
     }
diff --git a/src/main/java/org/umlgraph/doclet/util/ElementUtil.java b/src/main/java/org/umlgraph/doclet/util/ElementUtil.java
index e00c884..fe54ded 100644
--- a/src/main/java/org/umlgraph/doclet/util/ElementUtil.java
+++ b/src/main/java/org/umlgraph/doclet/util/ElementUtil.java
@@ -1,5 +1,6 @@
 package org.umlgraph.doclet.util;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -21,6 +22,16 @@ import javax.lang.model.util.Types;
 import jdk.javadoc.doclet.DocletEnvironment;
 
 public class ElementUtil {
+
+    public static boolean isType(TypeMirror type, TypeKind kind) {
+        if (type.getKind() == kind) {
+            return true;
+        }
+        if (type.getKind() == TypeKind.ARRAY) {
+            return isType(((ArrayType) type).getComponentType(), kind);
+        }
+        return false;
+    }
     
     public static CharSequence getSimpleName(Types types, TypeMirror t) {
         if (t instanceof ArrayType) {
@@ -71,13 +82,19 @@ public class ElementUtil {
             return null;
         }
         if (clazz instanceof ArrayType) {
-            return getTypeElement(((ArrayType) clazz).getComponentType());
+            TypeMirror componentType = ((ArrayType) clazz).getComponentType();
+            return getTypeElement(componentType);
         }
         if (!(clazz instanceof DeclaredType)) {
+            System.err.println("getTypeElement will return null for type class : " + clazz + " instanceof " + clazz.getClass() + " and kind " + clazz.getKind());
             return null;
         }
         Element scd = ((DeclaredType) clazz).asElement();
-        return scd instanceof TypeElement ? (TypeElement) scd : null;
+        if (!(scd instanceof TypeElement)) {
+            System.err.println("getTypeElement will return null for element class : " + scd == null ? "null" : scd.getClass());
+            return null;
+        }
+        return (TypeElement) scd;
     }
 
     public static TypeMirror getSuperclassType(DeclaredType pt) {
@@ -88,8 +105,11 @@ public class ElementUtil {
         return getTypeElement(element.getSuperclass());
     }
     
-    public static List<? extends TypeMirror> getInterfacesTypes(TypeElement element) {
-        return element.getInterfaces();
+    public static List<? extends TypeMirror> getInterfacesTypes(Element element) {
+        if (element instanceof TypeElement) {
+            return ((TypeElement) element).getInterfaces();
+        }
+        return Collections.emptyList();
     }
 
     public static List<TypeElement> getInterfaces(TypeElement element) {