From 4893dacbd4290c1f5a2fa0fb0124cd76e2c76dc5 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Fri, 3 May 2024 15:00:31 +0200 Subject: [PATCH] refactor(static-html): Extract a variable for the effective license Improve consistency. Signed-off-by: Frank Viernau --- .../src/main/kotlin/TablesReportModelMapper.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/reporters/static-html/src/main/kotlin/TablesReportModelMapper.kt b/plugins/reporters/static-html/src/main/kotlin/TablesReportModelMapper.kt index 70d7de6378650..1d30b98e2a2d3 100644 --- a/plugins/reporters/static-html/src/main/kotlin/TablesReportModelMapper.kt +++ b/plugins/reporters/static-html/src/main/kotlin/TablesReportModelMapper.kt @@ -137,6 +137,11 @@ private fun getProjectTable(input: ReporterInput, project: Project): ProjectTabl .sortedBy { it.license.toString() } val detectedLicenses = resolvedLicenseInfo.filter { LicenseSource.DETECTED in it.sources } .sortedBy { it.license.toString() } + val effectiveLicense = resolvedLicenseInfo.filterExcluded().effectiveLicense( + LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED, + input.ortResult.getPackageLicenseChoices(id), + input.ortResult.getRepositoryLicenseChoices() + )?.sorted() val analyzerIssues = projectIssuesForId[id].orEmpty() + input.ortResult.analyzer?.result?.issues?.get(id) .orEmpty() @@ -151,11 +156,7 @@ private fun getProjectTable(input: ReporterInput, project: Project): ProjectTabl concludedLicense = concludedLicense, declaredLicenses = declaredLicenses, detectedLicenses = detectedLicenses, - effectiveLicense = resolvedLicenseInfo.filterExcluded().effectiveLicense( - LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED, - input.ortResult.getPackageLicenseChoices(id), - input.ortResult.getRepositoryLicenseChoices() - )?.sorted(), + effectiveLicense = effectiveLicense, analyzerIssues = analyzerIssues.map { it.toTableReportIssue(input.ortResult, input.howToFixTextProvider) },