CuratedPackage: Rename the pkg property to metadata

This avoids the ugly `pkg.pkg` construct when accessing the `Package` of a `CuratedPackage`. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Sep 26, 2022 · 077f525 · 077f525
1 parent c747f91
commit 077f525
Showing 43 changed files with 385 additions and 378 deletions.
diff --git a/advisor/src/main/kotlin/Advisor.kt b/advisor/src/main/kotlin/Advisor.kt
@@ -70,7 +70,7 @@ class Advisor(
 
         val results = sortedMapOf<Identifier, List<AdvisorResult>>()
 
-        val packages = ortResult.getPackages(skipExcluded).map { it.pkg }
+        val packages = ortResult.getPackages(skipExcluded).map { it.metadata }
         if (packages.isEmpty()) {
             logger.info { "There are no packages to give advice for." }
         } else {

diff --git a/advisor/src/test/kotlin/advisors/VulnerableCodeTest.kt b/advisor/src/test/kotlin/advisors/VulnerableCodeTest.kt
@@ -266,7 +266,7 @@ private fun resultFile(): File = File(TEST_FILES_ROOT).resolve(TEST_RESULT_NAME)
  * Return a list with [Package]s from the analyzer result file that serve as input for the [VulnerableCode] advisor.
  */
 private fun inputPackages(): List<Package> =
-    resultFile().readValue<OrtResult>().getPackages(false).map { it.pkg }
+    resultFile().readValue<OrtResult>().getPackages(false).map { it.metadata }
 
 /**
  * Generate the JSON body of the request to query information about packages. It mainly consists of an array with the