Merge "Handle more types in method throws clauses, including type variables" am: a59df15672 am: 5abfe973ed am: df2e1e664d am: ea9007c59f

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2523396

Change-Id: Ic2d947c70eefec0cd807df22eea6d724b851b2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
index 933889d..650856f 100644
--- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
@@ -115,18 +115,7 @@ abstract class ExecutableMemberDocImpl extends MemberDocImpl<ExecutableElement>
         if (thrownExceptions == null) {
             thrownExceptions = executableElement.getThrownTypes()
                     .stream()
-                    .map(typeMirror -> {
-                        Element element = context.environment.getTypeUtils().asElement(typeMirror);
-                        return switch (element.getKind()) {
-                            case CLASS, INTERFACE, ENUM -> ClassDocImpl.create(
-                                    (TypeElement) element,
-                                    context);
-                            case ANNOTATION_TYPE -> AnnotationTypeDocImpl.create(
-                                    (TypeElement) element,
-                                    context);
-                            default -> null;
-                        };
-                    })
+                    .map(typeMirror -> TypeImpl.create(typeMirror, context).asClassDoc())
                     .filter(Objects::nonNull)
                     .toArray(ClassDoc[]::new);
         }