From 7754349ac7f056a0f438baaa201bc4df4052bea0 Mon Sep 17 00:00:00 2001
From: Frank Viernau <frank_viernau@epam.com>
Date: Tue, 16 Jan 2024 16:10:51 +0100
Subject: [PATCH] refactor(list-copyrights-command): Simplify passing on
 package configs

Include the package configurations into the `OrtResult` and adjust
`processAllCopyrightStatements()` to consume them from the `OrtResult`.
This prepares for only passing on `OrtResult`s instead of `OrtResult`
`PackageConfigurationProvider` tuples.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
---
 .../src/main/kotlin/commands/ListCopyrightsCommand.kt    | 9 ++++-----
 helper-cli/src/main/kotlin/utils/Extensions.kt           | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/helper-cli/src/main/kotlin/commands/ListCopyrightsCommand.kt b/helper-cli/src/main/kotlin/commands/ListCopyrightsCommand.kt
index 798e46bc9df8..4e6621926cc3 100644
--- a/helper-cli/src/main/kotlin/commands/ListCopyrightsCommand.kt
+++ b/helper-cli/src/main/kotlin/commands/ListCopyrightsCommand.kt
@@ -32,6 +32,7 @@ import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.config.CopyrightGarbage
 import org.ossreviewtoolkit.model.config.orEmpty
 import org.ossreviewtoolkit.model.readValue
+import org.ossreviewtoolkit.model.utils.setPackageConfigurations
 import org.ossreviewtoolkit.plugins.packageconfigurationproviders.dir.DirPackageConfigurationProvider
 import org.ossreviewtoolkit.utils.common.expandTilde
 
@@ -77,13 +78,11 @@ internal class ListCopyrightsCommand : CliktCommand(
 
     override fun run() {
         val ortResult = readOrtResult(ortFile)
+            .setPackageConfigurations(DirPackageConfigurationProvider(packageConfigurationsDir))
         val copyrightGarbage = copyrightGarbageFile?.readValue<CopyrightGarbage>().orEmpty()
-        val packageConfigurationProvider = DirPackageConfigurationProvider(packageConfigurationsDir)
 
-        val copyrightStatements = ortResult.processAllCopyrightStatements(
-            copyrightGarbage = copyrightGarbage.items,
-            packageConfigurationProvider = packageConfigurationProvider
-        ).filter { packageId == null || it.packageId == packageId }
+        val copyrightStatements = ortResult.processAllCopyrightStatements(copyrightGarbage = copyrightGarbage.items)
+            .filter { packageId == null || it.packageId == packageId }
             .filter { licenseId == null || it.license.toString() == licenseId }
             .groupBy({ it.statement }, { it.rawStatements })
             .mapValues { it.value.flatten().toSortedSet() }
diff --git a/helper-cli/src/main/kotlin/utils/Extensions.kt b/helper-cli/src/main/kotlin/utils/Extensions.kt
index 4a2422ee42ed..be3c6aed5bc0 100644
--- a/helper-cli/src/main/kotlin/utils/Extensions.kt
+++ b/helper-cli/src/main/kotlin/utils/Extensions.kt
@@ -108,13 +108,12 @@ internal fun OrtResult.downloadSources(id: Identifier, sourceCodeOrigin: SourceC
 internal fun OrtResult.processAllCopyrightStatements(
     omitExcluded: Boolean = true,
     copyrightGarbage: Set<String> = emptySet(),
-    addAuthorsToCopyrights: Boolean = false,
-    packageConfigurationProvider: PackageConfigurationProvider = PackageConfigurationProvider.EMPTY
+    addAuthorsToCopyrights: Boolean = false
 ): List<ProcessedCopyrightStatement> {
     val result = mutableListOf<ProcessedCopyrightStatement>()
 
     val licenseInfoResolver = createLicenseInfoResolver(
-        packageConfigurationProvider = packageConfigurationProvider,
+        packageConfigurationProvider = this,
         copyrightGarbage = CopyrightGarbage(copyrightGarbage.toSortedSet()),
         addAuthorsToCopyrights = addAuthorsToCopyrights
     )