GROOVY-11988: Add support for {@inheritdoc} in external JDK classes

Author: daniellansun

subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java

@@ -27,6 +27,7 @@
 import org.codehaus.groovy.groovydoc.GroovyPackageDoc;
 import org.codehaus.groovy.groovydoc.GroovyType;
 
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,15 +42,15 @@ public class ExternalGroovyClassDoc implements GroovyClassDoc {
     private static final GroovyPackageDoc[] EMPTY_GROOVYPACKAGEDOC_ARRAY = new GroovyPackageDoc[0];
     private static final GroovyMethodDoc[] EMPTY_GROOVYMETHODDOC_ARRAY = new GroovyMethodDoc[0];
     private static final GroovyType[] EMPTY_GROOVYTYPE_ARRAY = new GroovyType[0];
-    private final Class externalClass;
+    private final Class<?> externalClass;
     private final List<GroovyAnnotationRef> annotationRefs;
 
     /**
      * Creates a doc entry for the given external (non-source) class.
      *
      * @param externalClass the reflected class to represent
      */
-    public ExternalGroovyClassDoc(Class externalClass) {
+    public ExternalGroovyClassDoc(Class<?> externalClass) {
         this.externalClass = externalClass;
         annotationRefs = new ArrayList<GroovyAnnotationRef>();
     }
@@ -75,23 +76,23 @@ public GroovyAnnotationRef[] annotations() {
      */
     @Override
     public String qualifiedTypeName() {
-        return externalClass.getName();
+        String canonicalName = externalClass.getCanonicalName();
+        return canonicalName != null ? canonicalName : externalClass.getName();
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public GroovyClassDoc superclass() {
-        Class aClass = externalClass.getSuperclass();
-        if (aClass != null) return new ExternalGroovyClassDoc(aClass);
-        return new ExternalGroovyClassDoc(Object.class);
+        Class<?> aClass = externalClass.getSuperclass();
+        return aClass != null ? new ExternalGroovyClassDoc(aClass) : null;
     }
 
     /**
      * Returns the underlying reflected class.
      */
-    public Class externalClass() {
+    public Class<?> externalClass() {
         return externalClass;
     }
 
@@ -107,7 +108,11 @@ public String getTypeSourceDescription() {
      */
     @Override
     public String simpleTypeName() {
-        return qualifiedTypeName(); // TODO fix
+        String simpleName = externalClass.getSimpleName();
+        if (!simpleName.isEmpty()) return simpleName;
+        String qualifiedName = qualifiedTypeName();
+        int lastDot = qualifiedName.lastIndexOf('.');
+        return lastDot >= 0 ? qualifiedName.substring(lastDot + 1) : qualifiedName;
     }
 
     /**
@@ -248,7 +253,14 @@ public GroovyClassDoc[] innerClasses(boolean filter) {
      */
     @Override
     public GroovyClassDoc[] interfaces() {
-        return EMPTY_GROOVYCLASSDOC_ARRAY;
+        Class<?>[] interfaces = externalClass.getInterfaces();
+        if (interfaces.length == 0) return EMPTY_GROOVYCLASSDOC_ARRAY;
+
+        GroovyClassDoc[] result = new GroovyClassDoc[interfaces.length];
+        for (int i = 0; i < interfaces.length; i++) {
+            result[i] = new ExternalGroovyClassDoc(interfaces[i]);
+        }
+        return result;
     }
 
     /**
@@ -264,7 +276,7 @@ public GroovyType[] interfaceTypes() {
      */
     @Override
     public boolean isAbstract() {
-        return false;
+        return Modifier.isAbstract(externalClass.getModifiers());
     }
 
     /**
@@ -280,23 +292,23 @@ public boolean isExternalizable() {
      */
     @Override
     public boolean isSerializable() {
-        return false;
+        return java.io.Serializable.class.isAssignableFrom(externalClass);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public GroovyMethodDoc[] methods() {
-        return EMPTY_GROOVYMETHODDOC_ARRAY;
+        return ExternalJavadocSupport.methodsFor(this);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public GroovyMethodDoc[] methods(boolean filter) {
-        return EMPTY_GROOVYMETHODDOC_ARRAY;
+        return methods();
     }
 
     /**
@@ -360,7 +372,7 @@ public GroovyPackageDoc containingPackage() {
      */
     @Override
     public boolean isFinal() {
-        return false;
+        return Modifier.isFinal(externalClass.getModifiers());
     }
 
     /**
@@ -376,31 +388,31 @@ public boolean isPackagePrivate() {
      */
     @Override
     public boolean isPrivate() {
-        return false;
+        return Modifier.isPrivate(externalClass.getModifiers());
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public boolean isProtected() {
-        return false;
+        return Modifier.isProtected(externalClass.getModifiers());
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public boolean isPublic() {
-        return false;
+        return Modifier.isPublic(externalClass.getModifiers());
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public boolean isStatic() {
-        return false;
+        return Modifier.isStatic(externalClass.getModifiers());
     }
 
     /**
@@ -416,15 +428,15 @@ public String modifiers() {
      */
     @Override
     public int modifierSpecifier() {
-        return 0;
+        return externalClass.getModifiers();
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public String qualifiedName() {
-        return null;
+        return externalClass.getName();
     }
 
     /**
@@ -448,7 +460,7 @@ public String getRawCommentText() {
      */
     @Override
     public boolean isAnnotationType() {
-        return false;
+        return externalClass.isAnnotation();
     }
 
     /**
@@ -464,7 +476,7 @@ public boolean isAnnotationTypeElement() {
      */
     @Override
     public boolean isClass() {
-        return false;
+        return !externalClass.isInterface() && !externalClass.isAnnotation() && !externalClass.isEnum() && !externalClass.isRecord();
     }
 
     /**
@@ -488,15 +500,15 @@ public boolean isDeprecated() {
      */
     @Override
     public boolean isEnum() {
-        return false;
+        return externalClass.isEnum();
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public boolean isRecord() {
-        return false;
+        return externalClass.isRecord();
     }
 
     /**
@@ -544,7 +556,7 @@ public boolean isIncluded() {
      */
     @Override
     public boolean isInterface() {
-        return false;
+        return externalClass.isInterface();
     }
 
     /**
@@ -560,7 +572,7 @@ public boolean isMethod() {
      */
     @Override
     public boolean isOrdinaryClass() {
-        return false;
+        return isClass();
     }
 
     /**