diff --git a/plugins/commands/reporter/src/main/kotlin/ReporterCommand.kt b/plugins/commands/reporter/src/main/kotlin/ReporterCommand.kt index b4b5e60180112..bd56a42e660f6 100644 --- a/plugins/commands/reporter/src/main/kotlin/ReporterCommand.kt +++ b/plugins/commands/reporter/src/main/kotlin/ReporterCommand.kt @@ -257,7 +257,6 @@ class ReporterCommand : OrtCommand( ortResult, ortConfig, packageConfigurationProvider, - DefaultResolutionProvider(ortResult.getResolutions()), DefaultLicenseTextProvider(licenseTextDirectories), copyrightGarbage, licenseInfoResolver, diff --git a/plugins/reporters/evaluated-model/src/funTest/kotlin/EvaluatedModelReporterFunTest.kt b/plugins/reporters/evaluated-model/src/funTest/kotlin/EvaluatedModelReporterFunTest.kt index c2a7f4f91738f..bd264e71d360c 100644 --- a/plugins/reporters/evaluated-model/src/funTest/kotlin/EvaluatedModelReporterFunTest.kt +++ b/plugins/reporters/evaluated-model/src/funTest/kotlin/EvaluatedModelReporterFunTest.kt @@ -27,7 +27,6 @@ import io.kotest.matchers.shouldBe import org.ossreviewtoolkit.model.FileFormat import org.ossreviewtoolkit.model.OrtResult import org.ossreviewtoolkit.model.config.PluginConfiguration -import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider import org.ossreviewtoolkit.reporter.ReporterInput import org.ossreviewtoolkit.utils.common.normalizeLineBreaks import org.ossreviewtoolkit.utils.test.getAssetAsString @@ -66,7 +65,6 @@ class EvaluatedModelReporterFunTest : WordSpec({ private fun TestConfiguration.generateReport(ortResult: OrtResult, options: Map = emptyMap()): String { val input = ReporterInput( ortResult = ortResult, - resolutionProvider = DefaultResolutionProvider.create(ortResult), howToFixTextProvider = { "Some how to fix text." } ) diff --git a/plugins/reporters/opossum/src/funTest/kotlin/OpossumReporterFunTest.kt b/plugins/reporters/opossum/src/funTest/kotlin/OpossumReporterFunTest.kt index 1751dbc562487..d4aa779ed2d5e 100644 --- a/plugins/reporters/opossum/src/funTest/kotlin/OpossumReporterFunTest.kt +++ b/plugins/reporters/opossum/src/funTest/kotlin/OpossumReporterFunTest.kt @@ -29,7 +29,6 @@ import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import org.ossreviewtoolkit.model.OrtResult -import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider import org.ossreviewtoolkit.reporter.ReporterInput import org.ossreviewtoolkit.utils.common.normalizeLineBreaks import org.ossreviewtoolkit.utils.common.unpackZip @@ -59,10 +58,7 @@ class OpossumReporterFunTest : WordSpec({ }) private fun TestConfiguration.generateReport(ortResult: OrtResult): String { - val input = ReporterInput( - ortResult = ortResult, - resolutionProvider = DefaultResolutionProvider(ortResult.getRepositoryConfigResolutions()) - ) + val input = ReporterInput(ortResult = ortResult) val outputDir = tempdir() OpossumReporter().generateReport(input, outputDir).single().unpackZip(outputDir) diff --git a/plugins/reporters/static-html/src/funTest/kotlin/StaticHtmlReporterFunTest.kt b/plugins/reporters/static-html/src/funTest/kotlin/StaticHtmlReporterFunTest.kt index c43863d42c176..71feee5ca53b5 100644 --- a/plugins/reporters/static-html/src/funTest/kotlin/StaticHtmlReporterFunTest.kt +++ b/plugins/reporters/static-html/src/funTest/kotlin/StaticHtmlReporterFunTest.kt @@ -27,7 +27,6 @@ import io.kotest.matchers.shouldBe import javax.xml.transform.TransformerFactory import org.ossreviewtoolkit.model.OrtResult -import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider import org.ossreviewtoolkit.reporter.HowToFixTextProvider import org.ossreviewtoolkit.reporter.ReporterInput import org.ossreviewtoolkit.utils.ort.Environment @@ -70,7 +69,6 @@ class StaticHtmlReporterFunTest : WordSpec({ private fun TestConfiguration.generateReport(ortResult: OrtResult): String { val input = ReporterInput( ortResult = ortResult, - resolutionProvider = DefaultResolutionProvider.create(ortResult), howToFixTextProvider = HOW_TO_FIX_TEXT_PROVIDER ) diff --git a/reporter/src/main/kotlin/ReporterInput.kt b/reporter/src/main/kotlin/ReporterInput.kt index d3a993956462e..0c3eb664e98e7 100644 --- a/reporter/src/main/kotlin/ReporterInput.kt +++ b/reporter/src/main/kotlin/ReporterInput.kt @@ -21,7 +21,6 @@ package org.ossreviewtoolkit.reporter import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.OrtResult -import org.ossreviewtoolkit.model.RuleViolation import org.ossreviewtoolkit.model.config.CopyrightGarbage import org.ossreviewtoolkit.model.config.OrtConfiguration import org.ossreviewtoolkit.model.config.PackageConfiguration @@ -29,9 +28,7 @@ import org.ossreviewtoolkit.model.config.createFileArchiver import org.ossreviewtoolkit.model.licenses.DefaultLicenseInfoProvider import org.ossreviewtoolkit.model.licenses.LicenseClassifications import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver -import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider import org.ossreviewtoolkit.model.utils.PackageConfigurationProvider -import org.ossreviewtoolkit.model.utils.ResolutionProvider import org.ossreviewtoolkit.reporter.StatisticsCalculator.getStatistics /** @@ -53,11 +50,6 @@ data class ReporterInput( */ val packageConfigurationProvider: PackageConfigurationProvider = PackageConfigurationProvider.EMPTY, - /** - * A [ResolutionProvider], can be used to check which [Issue]s and [RuleViolation]s are resolved. - */ - val resolutionProvider: ResolutionProvider = DefaultResolutionProvider(), - /** * A [LicenseTextProvider], can be used to integrate licenses texts into reports. */