perf(GenerateScopeExcludesCommand): Deduplicate scopes into sets

This also avoids logging the same scope multiple times. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Apr 15, 2024 · 615ae0a · 615ae0a
1 parent 50069be
commit 615ae0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/GenerateScopeExcludesCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/GenerateScopeExcludesCommand.kt
@@ -77,7 +77,7 @@ internal class GenerateScopeExcludesCommand : CliktCommand(
 }
 
 private fun OrtResult.generateScopeExcludes(): List<ScopeExclude> {
-    val projectScopes = getProjects().flatMap { project ->
+    val projectScopes = getProjects().flatMapTo(mutableSetOf()) { project ->
         dependencyNavigator.scopeNames(project)
     }
 

diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/RemoveEntriesCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/RemoveEntriesCommand.kt
@@ -94,7 +94,7 @@ internal class RemoveEntriesCommand : CliktCommand(
 
         val scopeExcludes = ortResult
             .getProjects()
-            .flatMap { project -> project.scopes.map { scope -> scope.name } }
+            .flatMapTo(mutableSetOf()) { project -> project.scopes.map { scope -> scope.name } }
             .let { projectScopes -> ortResult.getExcludes().scopes.minimize(projectScopes) }
 
         val licenseFindings = ortResult.getProjectLicenseFindings()

diff --git a/helper-cli/src/main/kotlin/utils/Extensions.kt b/helper-cli/src/main/kotlin/utils/Extensions.kt
@@ -79,7 +79,7 @@ import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression
  * Return an approximated minimal sublist of [this] so that the result still matches the exact same entries of the given
  * [projectScopes].
  */
-internal fun List<ScopeExclude>.minimize(projectScopes: List<String>): List<ScopeExclude> {
+internal fun List<ScopeExclude>.minimize(projectScopes: Set<String>): List<ScopeExclude> {
     val scopeExcludes = associateWith { scopeExclude ->
         projectScopes.filter { scopeExclude.matches(it) }.toSet()
     }