commit b41c39f8419f41d2c908deb6e5d8019230b75642
author Paul Duffin <paulduffin@google.com> Fri Sep 08 16:41:34 2023 +0100
committer Paul Duffin <paulduffin@google.com> Tue Sep 12 23:41:08 2023 +0100
tree 0b71b43aa150708963dd93b2342bacdfbcff5d32
parent ad9e9fd72b02db23e33709c34fc43e19576a3691

Add showUnannotated JDiffXmlWriter constructor parameter

Removes a use of `options`.

Bug: 299280167
Test: ./gradlew
Change-Id: I911820e6077b67638a9f7d1b5b0cf7f8be9a2080

src/main/java/com/android/tools/metalava/ConvertFile.kt

diff --git a/src/main/java/com/android/tools/metalava/ConvertFile.kt b/src/main/java/com/android/tools/metalava/ConvertFile.kt
index b0f6bc9..108649d 100644
--- a/src/main/java/com/android/tools/metalava/ConvertFile.kt
+++ b/src/main/java/com/android/tools/metalava/ConvertFile.kt
@@ -79,6 +79,7 @@
             apiReference,
             signatureApi.preFiltered && !strip,
             apiName,
+            showUnannotated = false,
             ApiVisitor.Config(),
         )
     }

src/main/java/com/android/tools/metalava/Driver.kt

diff --git a/src/main/java/com/android/tools/metalava/Driver.kt b/src/main/java/com/android/tools/metalava/Driver.kt
index ec8e4fa..5b610d6 100644
--- a/src/main/java/com/android/tools/metalava/Driver.kt
+++ b/src/main/java/com/android/tools/metalava/Driver.kt
@@ -291,7 +291,14 @@
         val apiReference = apiType.getReferenceFilter(options.apiPredicateConfig)
 
         createReportFile(progressTracker, codebase, apiFile, "XML API") { printWriter ->
-            JDiffXmlWriter(printWriter, apiEmit, apiReference, codebase.preFiltered)
+            JDiffXmlWriter(
+                printWriter,
+                apiEmit,
+                apiReference,
+                codebase.preFiltered,
+                showUnannotated = @Suppress("DEPRECATION") options.showUnannotated,
+                config = options.apiVisitorConfig,
+            )
         }
     }
 

src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt

diff --git a/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt b/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt
index 99d5a19..729739d 100644
--- a/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt
+++ b/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt
@@ -48,7 +48,8 @@
     filterReference: Predicate<Item>,
     private val preFiltered: Boolean,
     private val apiName: String? = null,
-    config: Config = @Suppress("DEPRECATION") options.apiVisitorConfig,
+    showUnannotated: Boolean,
+    config: Config,
 ) :
     ApiVisitor(
         visitConstructorsAsMethods = false,
@@ -58,7 +59,7 @@
         fieldComparator = FieldItem.comparator,
         filterEmit = filterEmit,
         filterReference = filterReference,
-        showUnannotated = @Suppress("DEPRECATION") options.showUnannotated,
+        showUnannotated = showUnannotated,
         config = config,
     ) {
     override fun visitCodebase(codebase: Codebase) {
@@ -263,7 +264,7 @@
     }
 
     private fun writeInterfaceList(cls: ClassItem) {
-        var interfaces =
+        val interfaces =
             if (preFiltered) cls.interfaceTypes().asSequence()
             else cls.filteredInterfaceTypes(filterReference).asSequence()
 
@@ -303,7 +304,7 @@
                 else -> method.filteredThrowsTypes(filterReference).asSequence()
             }
         if (throws.any()) {
-            throws.asSequence().sortedWith(ClassItem.fullNameComparator).forEach { type ->
+            throws.sortedWith(ClassItem.fullNameComparator).forEach { type ->
                 writer.print("<exception name=\"")
                 writer.print(type.fullName())
                 writer.print("\" type=\"")