refactor(reporter)!: Move ReportTableModel to the static HTML plugin

Prepare for reducing its visibility. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
oss-review-toolkit · Nov 24, 2023 · 89aaf0c · 89aaf0c
1 parent 2107657
commit 89aaf0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/reporter/src/main/kotlin/ReportTableModel.kt → ...-html/src/main/kotlin/ReportTableModel.kt b/reporter/src/main/kotlin/ReportTableModel.kt → ...-html/src/main/kotlin/ReportTableModel.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.reporter
+package org.ossreviewtoolkit.plugins.reporters.statichtml
 
 import java.util.SortedMap
 

diff --git a/...src/main/kotlin/ReportTableModelMapper.kt → ...src/main/kotlin/ReportTableModelMapper.kt b/...src/main/kotlin/ReportTableModelMapper.kt → ...src/main/kotlin/ReportTableModelMapper.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.reporter
+package org.ossreviewtoolkit.plugins.reporters.statichtml
 
 import org.ossreviewtoolkit.model.DependencyNavigator
 import org.ossreviewtoolkit.model.Identifier
@@ -32,12 +32,13 @@ import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver
 import org.ossreviewtoolkit.model.licenses.LicenseView
 import org.ossreviewtoolkit.model.orEmpty
 import org.ossreviewtoolkit.model.utils.ResolutionProvider
-import org.ossreviewtoolkit.reporter.ReportTableModel.DependencyRow
-import org.ossreviewtoolkit.reporter.ReportTableModel.IssueRow
-import org.ossreviewtoolkit.reporter.ReportTableModel.IssueTable
-import org.ossreviewtoolkit.reporter.ReportTableModel.ProjectTable
-import org.ossreviewtoolkit.reporter.ReportTableModel.ResolvableIssue
-import org.ossreviewtoolkit.reporter.ReportTableModel.ResolvableViolation
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.DependencyRow
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.IssueRow
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.IssueTable
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.ProjectTable
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.ResolvableIssue
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.ResolvableViolation
+import org.ossreviewtoolkit.reporter.HowToFixTextProvider
 
 /**
  * A mapper which converts an [OrtResult] to a [ReportTableModel].

diff --git a/plugins/reporters/static-html/src/main/kotlin/StaticHtmlReporter.kt b/plugins/reporters/static-html/src/main/kotlin/StaticHtmlReporter.kt
@@ -48,14 +48,11 @@ import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.model.config.ScopeExclude
 import org.ossreviewtoolkit.model.licenses.ResolvedLicenseLocation
 import org.ossreviewtoolkit.model.yamlMapper
-import org.ossreviewtoolkit.reporter.ReportTableModel
-import org.ossreviewtoolkit.reporter.ReportTableModel.IssueTable
-import org.ossreviewtoolkit.reporter.ReportTableModel.ProjectTable
-import org.ossreviewtoolkit.reporter.ReportTableModel.ResolvableIssue
-import org.ossreviewtoolkit.reporter.ReportTableModelMapper
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.IssueTable
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.ProjectTable
+import org.ossreviewtoolkit.plugins.reporters.statichtml.ReportTableModel.ResolvableIssue
 import org.ossreviewtoolkit.reporter.Reporter
 import org.ossreviewtoolkit.reporter.ReporterInput
-import org.ossreviewtoolkit.reporter.containsUnresolved
 import org.ossreviewtoolkit.utils.common.isValidUri
 import org.ossreviewtoolkit.utils.common.joinNonBlank
 import org.ossreviewtoolkit.utils.common.normalizeLineBreaks