Snap for 10132053 from d92e8a78b52420fea651b398bc207552d72bdba3 to udc-release
Change-Id: I16083bb088387629a20645771bdd12e6cfeb8c06
diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
index 66be504..20ae382 100644
--- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
@@ -61,13 +61,13 @@
public String qualifiedName() {
var enclosingClass = executableElement.getEnclosingElement();
return switch (enclosingClass.getKind()) {
- case CLASS, INTERFACE, ANNOTATION_TYPE, ENUM -> {
+ case CLASS, INTERFACE, ANNOTATION_TYPE, ENUM, RECORD -> {
var enclosingClassName =
((TypeElement) enclosingClass).getQualifiedName().toString();
yield enclosingClassName + "." + name();
}
default -> throw new UnsupportedOperationException("Expected CLASS, INTERFACE, "
- + "ANNOTATION_TYPE or ENUM, but got " + enclosingClass.getKind());
+ + "ANNOTATION_TYPE, ENUM, or RECORD, but got " + enclosingClass.getKind());
};
}
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index 930d52c..a90ed6e 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -53,7 +53,7 @@
boolean keepStubComments) {
// figure out which classes we need
final HashSet<ClassInfo> notStrippable = new HashSet<ClassInfo>();
- Collection<ClassInfo> all = Converter.allClasses();
+ Collection<ClassInfo> all = List.copyOf(Converter.allClasses());
Map<PackageInfo, List<ClassInfo>> allClassesByPackage = null;
PrintStream apiWriter = null;
PrintStream dexApiWriter = null;
