refactor: Use the Severity enum in issues

mnonnenmacher · nnobelis · commit 542bcff293c3 · 2024-08-29T12:25:47.000Z
Change the API and backend model `Issue` class to use the `Severity`
enums as type for the `severity` property. This ensures that only valid
values are used.

A database migration is not required because outside of test code only
valid values were used before.

Signed-off-by: Martin Nonnenmacher &lt;martin.nonnenmacher@bosch.com&gt;
diff --git a/api/v1/mapping/src/commonMain/kotlin/Mappings.kt b/api/v1/mapping/src/commonMain/kotlin/Mappings.kt
@@ -64,6 +64,7 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.RepositoryType as ApiReposito
 import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJob as ApiScannerJob
 import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJobConfiguration as ApiScannerJobConfiguration
 import org.eclipse.apoapsis.ortserver.api.v1.model.Secret as ApiSecret
+import org.eclipse.apoapsis.ortserver.api.v1.model.Severity as ApiSeverity
 import org.eclipse.apoapsis.ortserver.api.v1.model.SortDirection as ApiSortDirection
 import org.eclipse.apoapsis.ortserver.api.v1.model.SortProperty as ApiSortProperty
 import org.eclipse.apoapsis.ortserver.api.v1.model.SourceCodeOrigin as ApiSourceCodeOrigin
@@ -101,6 +102,7 @@ import org.eclipse.apoapsis.ortserver.model.RepositoryType
 import org.eclipse.apoapsis.ortserver.model.ScannerJob
 import org.eclipse.apoapsis.ortserver.model.ScannerJobConfiguration
 import org.eclipse.apoapsis.ortserver.model.Secret
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.SourceCodeOrigin
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
 import org.eclipse.apoapsis.ortserver.model.runs.PackageManagerConfiguration
@@ -215,7 +217,13 @@ fun ApiEvaluatorJobConfiguration.mapToModel() =
         ruleSet
     )
 
-fun Issue.mapToApi() = ApiIssue(timestamp, source, message, severity)
+fun Issue.mapToApi() = ApiIssue(timestamp, source, message, severity.mapToApi())
+
+fun Severity.mapToApi() = when (this) {
+    Severity.ERROR -> ApiSeverity.ERROR
+    Severity.WARNING -> ApiSeverity.WARNING
+    Severity.HINT -> ApiSeverity.HINT
+}
 
 fun JobStatus.mapToApi() = ApiJobStatus.valueOf(name)
 
diff --git a/api/v1/model/src/commonMain/kotlin/Issue.kt b/api/v1/model/src/commonMain/kotlin/Issue.kt
@@ -36,6 +36,6 @@ data class Issue(
     /** A message describing the issue. */
     val message: String,
 
-    /** The severity, such as ERROR, HINT, etc. */
-    val severity: String
+    /** The [Severity] of the issue. */
+    val severity: Severity
 )
diff --git a/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt b/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt
@@ -38,6 +38,7 @@ import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScanner
 import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScannersTable
 import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsTable
 import org.eclipse.apoapsis.ortserver.dao.tables.runs.shared.EnvironmentDao
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.repositories.ScannerRunRepository
 import org.eclipse.apoapsis.ortserver.model.runs.Environment
 import org.eclipse.apoapsis.ortserver.model.runs.Identifier
@@ -126,7 +127,7 @@ class DaoScannerRunRepository(private val db: Database) : ScannerRunRepository {
                         source = "scanner",
                         message = "Could not resolve provenance for package '$identifier': " +
                                 "${packageProvenanceDao.errorMessage}",
-                        severity = "ERROR"
+                        severity = Severity.ERROR
                     )
                 )
                 add(result)
@@ -143,7 +144,7 @@ class DaoScannerRunRepository(private val db: Database) : ScannerRunRepository {
                         timestamp = Clock.System.now(),
                         source = "scanner",
                         message = "Could not resolve nested provenance for provenance '$packageProvenance'.",
-                        severity = "ERROR"
+                        severity = Severity.ERROR
                     )
                 )
                 add(result)
diff --git a/dao/src/main/kotlin/tables/runs/shared/IssuesTable.kt b/dao/src/main/kotlin/tables/runs/shared/IssuesTable.kt
@@ -20,6 +20,7 @@
 package org.eclipse.apoapsis.ortserver.dao.tables.runs.shared
 
 import org.eclipse.apoapsis.ortserver.dao.utils.toDatabasePrecision
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
 
 import org.jetbrains.exposed.dao.LongEntity
@@ -35,7 +36,7 @@ object IssuesTable : LongIdTable("issues") {
     val timestamp = timestamp("timestamp")
     val issueSource = text("source")
     val message = text("message")
-    val severity = text("severity")
+    val severity = enumerationByName<Severity>("severity", 128)
 }
 
 class IssueDao(id: EntityID<Long>) : LongEntity(id) {
diff --git a/dao/src/test/kotlin/repositories/DaoAdvisorRunRepositoryTest.kt b/dao/src/test/kotlin/repositories/DaoAdvisorRunRepositoryTest.kt
@@ -30,6 +30,7 @@ import org.eclipse.apoapsis.ortserver.dao.test.DatabaseTestExtension
 import org.eclipse.apoapsis.ortserver.dao.test.Fixtures
 import org.eclipse.apoapsis.ortserver.dao.utils.toDatabasePrecision
 import org.eclipse.apoapsis.ortserver.model.PluginConfiguration
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.runs.Environment
 import org.eclipse.apoapsis.ortserver.model.runs.Identifier
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
@@ -174,7 +175,7 @@ val issue = Issue(
     timestamp = Clock.System.now().toDatabasePrecision(),
     source = "source",
     message = "message",
-    severity = "ERROR"
+    severity = Severity.ERROR
 )
 
 val defect = Defect(
diff --git a/dao/src/test/kotlin/repositories/DaoOrtRunRepositoryTest.kt b/dao/src/test/kotlin/repositories/DaoOrtRunRepositoryTest.kt
@@ -34,6 +34,7 @@ import org.eclipse.apoapsis.ortserver.model.AnalyzerJobConfiguration
 import org.eclipse.apoapsis.ortserver.model.JobConfigurations
 import org.eclipse.apoapsis.ortserver.model.OrtRun
 import org.eclipse.apoapsis.ortserver.model.OrtRunStatus
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
 import org.eclipse.apoapsis.ortserver.model.util.ListQueryParameters
 import org.eclipse.apoapsis.ortserver.model.util.ListQueryResult
@@ -235,9 +236,9 @@ class DaoOrtRunRepositoryTest : StringSpec({
     }
 
     "update should update an entry in the database" {
-        val issue1 = Issue(Instant.parse("2023-08-02T06:16:10Z"), "existing", "An initial issue", "WARNING")
-        val issue2 = Issue(Instant.parse("2023-08-02T06:17:16Z"), "new1", "An new issue", "HINT")
-        val issue3 = Issue(Instant.parse("2023-08-02T06:17:36Z"), "new2", "Another new issue", "ERROR")
+        val issue1 = Issue(Instant.parse("2023-08-02T06:16:10Z"), "existing", "An initial issue", Severity.WARNING)
+        val issue2 = Issue(Instant.parse("2023-08-02T06:17:16Z"), "new1", "An new issue", Severity.HINT)
+        val issue3 = Issue(Instant.parse("2023-08-02T06:17:36Z"), "new2", "Another new issue", Severity.ERROR)
 
         val label2Value = "new value for label2"
         val label3Value = "a newly added label"
diff --git a/model/src/commonMain/kotlin/runs/Issue.kt b/model/src/commonMain/kotlin/runs/Issue.kt
@@ -22,10 +22,12 @@ package org.eclipse.apoapsis.ortserver.model.runs
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 
+import org.eclipse.apoapsis.ortserver.model.Severity
+
 @Serializable
 data class Issue(
     val timestamp: Instant,
     val source: String,
     val message: String,
-    val severity: String
+    val severity: Severity
 )
diff --git a/orchestrator/src/main/kotlin/Orchestrator.kt b/orchestrator/src/main/kotlin/Orchestrator.kt
@@ -28,6 +28,7 @@ import org.eclipse.apoapsis.ortserver.model.JobConfigurations
 import org.eclipse.apoapsis.ortserver.model.JobStatus
 import org.eclipse.apoapsis.ortserver.model.OrtRun
 import org.eclipse.apoapsis.ortserver.model.OrtRunStatus
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.WorkerJob
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerError
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerResult
@@ -417,5 +418,5 @@ fun <T : Any> Endpoint<T>.createErrorIssue(): Issue = Issue(
     timestamp = Clock.System.now(),
     source = configPrefix,
     message = "The $configPrefix worker failed due to an unexpected error.",
-    severity = "ERROR"
+    severity = Severity.ERROR
 )
diff --git a/orchestrator/src/test/kotlin/OrchestratorTest.kt b/orchestrator/src/test/kotlin/OrchestratorTest.kt
@@ -56,6 +56,7 @@ import org.eclipse.apoapsis.ortserver.model.Repository
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
 import org.eclipse.apoapsis.ortserver.model.ScannerJob
 import org.eclipse.apoapsis.ortserver.model.ScannerJobConfiguration
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.WorkerJob
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerError
 import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerResult
@@ -387,7 +388,7 @@ class OrchestratorTest : WordSpec() {
                         id = withArg { it shouldBe configWorkerError.ortRunId },
                         status = withArg { it.verifyOptionalValue(OrtRunStatus.FAILED) },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", ConfigEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, ConfigEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -686,7 +687,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe analyzerJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", AnalyzerEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, AnalyzerEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -892,7 +893,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe advisorJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", AdvisorEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, AdvisorEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -983,7 +984,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe evaluatorJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", EvaluatorEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, EvaluatorEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -1136,7 +1137,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe reporterJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", ReporterEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, ReporterEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -1272,7 +1273,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe notifierJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", NotifierEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, NotifierEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -1331,7 +1332,7 @@ class OrchestratorTest : WordSpec() {
                     ortRunRepository.update(
                         id = withArg { it shouldBe notifierJob.ortRunId },
                         issues = withArg {
-                            verifyIssues(it) { verifyWorkerErrorIssues("ERROR", NotifierEndpoint.configPrefix) }
+                            verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, NotifierEndpoint.configPrefix) }
                         }
                     )
                 }
@@ -1837,7 +1838,7 @@ fun verifyIssues(
     issuesList.validate()
 }
 
-fun Collection<Issue>.verifyWorkerErrorIssues(severity: String, source: String) {
+fun Collection<Issue>.verifyWorkerErrorIssues(severity: Severity, source: String) {
     shouldBeSingleton { issue ->
         issue.severity shouldBe severity
         issue.source shouldBe source
diff --git a/workers/common/src/main/kotlin/common/OrtMappings.kt b/workers/common/src/main/kotlin/common/OrtMappings.kt
@@ -25,6 +25,7 @@ import kotlinx.datetime.toKotlinInstant
 
 import org.eclipse.apoapsis.ortserver.model.PluginConfiguration
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.PackageCurationProviderConfig
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.ResolvedPackageCurations
 import org.eclipse.apoapsis.ortserver.model.runs.AnalyzerConfiguration
@@ -120,6 +121,7 @@ import org.ossreviewtoolkit.model.ScanResult as OrtScanResult
 import org.ossreviewtoolkit.model.ScanSummary as OrtScanSummary
 import org.ossreviewtoolkit.model.ScannerDetails as OrtScannerDetails
 import org.ossreviewtoolkit.model.ScannerRun as OrtScannerRun
+import org.ossreviewtoolkit.model.Severity as OrtSeverity
 import org.ossreviewtoolkit.model.Snippet as OrtSnippet
 import org.ossreviewtoolkit.model.SnippetFinding as OrtSnippetFinding
 import org.ossreviewtoolkit.model.TextLocation as OrtTextLocation
@@ -308,7 +310,7 @@ fun OrtIssue.mapToModel() =
         timestamp = timestamp.toKotlinInstant(),
         source = source,
         message = message,
-        severity = severity.name
+        severity = severity.mapToModel()
     )
 
 fun OrtPackage.mapToModel() =
@@ -521,6 +523,12 @@ fun OrtScanSummary.mapToModel() =
 
 fun OrtScopeExclude.mapToModel() = ScopeExclude(pattern, reason.name, comment)
 
+fun OrtSeverity.mapToModel() = when (this) {
+    OrtSeverity.ERROR -> Severity.ERROR
+    OrtSeverity.WARNING -> Severity.WARNING
+    OrtSeverity.HINT -> Severity.HINT
+}
+
 fun OrtSnippet.mapToModel() = Snippet(
     purl = purl,
     provenance = provenance.mapToModel(),
diff --git a/workers/common/src/main/kotlin/common/OrtServerMappings.kt b/workers/common/src/main/kotlin/common/OrtServerMappings.kt
@@ -32,6 +32,7 @@ import org.eclipse.apoapsis.ortserver.model.OrtRun
 import org.eclipse.apoapsis.ortserver.model.PluginConfiguration
 import org.eclipse.apoapsis.ortserver.model.ProviderPluginConfiguration
 import org.eclipse.apoapsis.ortserver.model.Repository
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.SourceCodeOrigin
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.PackageCurationProviderConfig
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.ResolvedConfiguration
@@ -313,7 +314,7 @@ fun Excludes.mapToOrt() = OrtExcludes(paths.map(PathExclude::mapToOrt), scopes.m
 
 fun Identifier.mapToOrt() = OrtIdentifier(type, namespace, name, version)
 
-fun Issue.mapToOrt() = OrtIssue(timestamp.toJavaInstant(), source, message, OrtSeverity.valueOf(severity))
+fun Issue.mapToOrt() = OrtIssue(timestamp.toJavaInstant(), source, message, severity.mapToOrt())
 
 fun IssueResolution.mapToOrt() = OrtIssueResolution(message, OrtIssueResolutionReason.valueOf(reason), comment)
 
@@ -632,6 +633,12 @@ fun ScanSummary.mapToOrt() =
 
 fun ScopeExclude.mapToOrt() = OrtScopeExclude(pattern, OrtScopeExcludeReason.valueOf(reason), comment)
 
+fun Severity.mapToOrt() = when (this) {
+    Severity.ERROR -> OrtSeverity.ERROR
+    Severity.WARNING -> OrtSeverity.WARNING
+    Severity.HINT -> OrtSeverity.HINT
+}
+
 fun Snippet.mapToOrt() = OrtSnippet(
     score = score,
     location = location.mapToOrt(),
diff --git a/workers/common/src/test/kotlin/OrtServerMappingsTest.kt b/workers/common/src/test/kotlin/OrtServerMappingsTest.kt
@@ -34,6 +34,7 @@ import org.eclipse.apoapsis.ortserver.model.OrtRunStatus
 import org.eclipse.apoapsis.ortserver.model.PluginConfiguration
 import org.eclipse.apoapsis.ortserver.model.Repository
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.PackageCurationProviderConfig
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.ResolvedConfiguration
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.ResolvedPackageCurations
@@ -120,7 +121,7 @@ class OrtServerMappingsTest : WordSpec({
                 timestamp = Instant.parse("2023-08-02T07:59:38Z"),
                 source = "test-tool",
                 message = "Some problem with this run",
-                severity = "WARN"
+                severity = Severity.WARNING
             )
 
             val ortRun = OrtRun(
@@ -270,7 +271,7 @@ class OrtServerMappingsTest : WordSpec({
                 timestamp = Instant.fromEpochSeconds(TIME_STAMP_SECONDS),
                 source = "tool-x",
                 message = "An issue occurred.",
-                severity = "ERROR"
+                severity = Severity.ERROR
             )
 
             val dependencyGraph = DependencyGraph(
diff --git a/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt b/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt
@@ -43,6 +43,7 @@ import org.eclipse.apoapsis.ortserver.dao.utils.toDatabasePrecision
 import org.eclipse.apoapsis.ortserver.model.Hierarchy
 import org.eclipse.apoapsis.ortserver.model.JobStatus
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.repositories.RepositoryConfigurationRepository
 import org.eclipse.apoapsis.ortserver.model.repositories.ResolvedConfigurationRepository
 import org.eclipse.apoapsis.ortserver.model.resolvedconfiguration.PackageCurationProviderConfig
@@ -953,13 +954,13 @@ class OrtRunServiceTest : WordSpec({
                     Instant.parse("2024-02-20T13:51:00Z"),
                     "issueSource",
                     "Some test issue",
-                    "HINT"
+                    Severity.HINT
                 ),
                 Issue(
                     Instant.parse("2024-02-20T13:52:00Z"),
                     "differentIssueSource",
                     "Some problematic issue",
-                    "WARN"
+                    Severity.WARNING
                 )
             )
 
diff --git a/workers/config/src/main/kotlin/ConfigValidator.kt b/workers/config/src/main/kotlin/ConfigValidator.kt
@@ -26,6 +26,7 @@ import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
 
 import kotlinx.datetime.Clock
 
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
 import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContext
 
@@ -66,7 +67,7 @@ class ConfigValidator private constructor(private val context: WorkerContext) :
                         INVALID_SCRIPT_SOURCE,
                         "Error when executing validation script. This is a problem with the configuration " +
                                 "of ORT Server.",
-                        "ERROR"
+                        Severity.ERROR
                     )
                 )
             ).also {
diff --git a/workers/config/src/test/kotlin/ConfigValidatorTest.kt b/workers/config/src/test/kotlin/ConfigValidatorTest.kt
@@ -40,6 +40,7 @@ import org.eclipse.apoapsis.ortserver.model.Hierarchy
 import org.eclipse.apoapsis.ortserver.model.OrtRun
 import org.eclipse.apoapsis.ortserver.model.Repository
 import org.eclipse.apoapsis.ortserver.model.RepositoryType
+import org.eclipse.apoapsis.ortserver.model.Severity
 import org.eclipse.apoapsis.ortserver.model.runs.Issue
 import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContext
 
@@ -62,7 +63,7 @@ class ConfigValidatorTest : StringSpec({
             Clock.System.now(),
             "validation",
             "Current repository is ${testHierarchy.repository.url}",
-            "Hint"
+            Severity.HINT
         )
         validationResult.issues shouldHaveSize 1
         checkIssue(expectedIssue, validationResult.issues[0])
@@ -82,7 +83,7 @@ class ConfigValidatorTest : StringSpec({
             Clock.System.now(),
             "validation",
             "Current repository is ${testHierarchy.repository.url}; invalid parameters.",
-            "Error"
+            Severity.ERROR
         )
         validationResult.issues shouldHaveSize 1
         checkIssue(expectedIssue, validationResult.issues[0])
@@ -99,7 +100,7 @@ class ConfigValidatorTest : StringSpec({
         with(validationResult.issues[0]) {
             source shouldBe ConfigValidator.INVALID_SCRIPT_SOURCE
             message shouldContain "executing validation script"
-            severity shouldBe "ERROR"
+            severity shouldBe Severity.ERROR
         }
     }
 })
diff --git a/workers/config/src/test/kotlin/ConfigWorkerTest.kt b/workers/config/src/test/kotlin/ConfigWorkerTest.kt
diff --git a/workers/config/src/test/resources/validation-failure.params.kts b/workers/config/src/test/resources/validation-failure.params.kts
diff --git a/workers/config/src/test/resources/validation-success.params.kts b/workers/config/src/test/resources/validation-success.params.kts
diff --git a/workers/reporter/src/main/kotlin/reporter/ReporterRunner.kt b/workers/reporter/src/main/kotlin/reporter/ReporterRunner.kt
diff --git a/workers/reporter/src/test/kotlin/reporter/ReporterRunnerTest.kt b/workers/reporter/src/test/kotlin/reporter/ReporterRunnerTest.kt
diff --git a/workers/reporter/src/test/kotlin/reporter/ReporterWorkerTest.kt b/workers/reporter/src/test/kotlin/reporter/ReporterWorkerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ data class Issue(`
`36`	`36`	`/** A message describing the issue. */`
`37`	`37`	`val message: String,`
`38`	`38`
`39`		`- /** The severity, such as ERROR, HINT, etc. */`
`40`		`- val severity: String`
	`39`	`+ /** The [Severity] of the issue. */`
	`40`	`+ val severity: Severity`
`41`	`41`	`)`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScanner`
`38`	`38`	`import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScannersTable`
`39`	`39`	`import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsTable`
`40`	`40`	`import org.eclipse.apoapsis.ortserver.dao.tables.runs.shared.EnvironmentDao`
	`41`	`+import org.eclipse.apoapsis.ortserver.model.Severity`
`41`	`42`	`import org.eclipse.apoapsis.ortserver.model.repositories.ScannerRunRepository`
`42`	`43`	`import org.eclipse.apoapsis.ortserver.model.runs.Environment`
`43`	`44`	`import org.eclipse.apoapsis.ortserver.model.runs.Identifier`
`@@ -126,7 +127,7 @@ class DaoScannerRunRepository(private val db: Database) : ScannerRunRepository {`
`126`	`127`	`source = "scanner",`
`127`	`128`	`message = "Could not resolve provenance for package '$identifier': " +`
`128`	`129`	`"${packageProvenanceDao.errorMessage}",`
`129`		`- severity = "ERROR"`
	`130`	`+ severity = Severity.ERROR`
`130`	`131`	`)`
`131`	`132`	`)`
`132`	`133`	`add(result)`
`@@ -143,7 +144,7 @@ class DaoScannerRunRepository(private val db: Database) : ScannerRunRepository {`
`143`	`144`	`timestamp = Clock.System.now(),`
`144`	`145`	`source = "scanner",`
`145`	`146`	`message = "Could not resolve nested provenance for provenance '$packageProvenance'.",`
`146`		`- severity = "ERROR"`
	`147`	`+ severity = Severity.ERROR`
`147`	`148`	`)`
`148`	`149`	`)`
`149`	`150`	`add(result)`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ import org.eclipse.apoapsis.ortserver.model.Repository`
`56`	`56`	`import org.eclipse.apoapsis.ortserver.model.RepositoryType`
`57`	`57`	`import org.eclipse.apoapsis.ortserver.model.ScannerJob`
`58`	`58`	`import org.eclipse.apoapsis.ortserver.model.ScannerJobConfiguration`
	`59`	`+import org.eclipse.apoapsis.ortserver.model.Severity`
`59`	`60`	`import org.eclipse.apoapsis.ortserver.model.WorkerJob`
`60`	`61`	`import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerError`
`61`	`62`	`import org.eclipse.apoapsis.ortserver.model.orchestrator.AdvisorWorkerResult`
`@@ -387,7 +388,7 @@ class OrchestratorTest : WordSpec() {`
`387`	`388`	`id = withArg { it shouldBe configWorkerError.ortRunId },`
`388`	`389`	`status = withArg { it.verifyOptionalValue(OrtRunStatus.FAILED) },`
`389`	`390`	`issues = withArg {`
`390`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", ConfigEndpoint.configPrefix) }`
	`391`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, ConfigEndpoint.configPrefix) }`
`391`	`392`	`}`
`392`	`393`	`)`
`393`	`394`	`}`
`@@ -686,7 +687,7 @@ class OrchestratorTest : WordSpec() {`
`686`	`687`	`ortRunRepository.update(`
`687`	`688`	`id = withArg { it shouldBe analyzerJob.ortRunId },`
`688`	`689`	`issues = withArg {`
`689`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", AnalyzerEndpoint.configPrefix) }`
	`690`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, AnalyzerEndpoint.configPrefix) }`
`690`	`691`	`}`
`691`	`692`	`)`
`692`	`693`	`}`
`@@ -892,7 +893,7 @@ class OrchestratorTest : WordSpec() {`
`892`	`893`	`ortRunRepository.update(`
`893`	`894`	`id = withArg { it shouldBe advisorJob.ortRunId },`
`894`	`895`	`issues = withArg {`
`895`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", AdvisorEndpoint.configPrefix) }`
	`896`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, AdvisorEndpoint.configPrefix) }`
`896`	`897`	`}`
`897`	`898`	`)`
`898`	`899`	`}`
`@@ -983,7 +984,7 @@ class OrchestratorTest : WordSpec() {`
`983`	`984`	`ortRunRepository.update(`
`984`	`985`	`id = withArg { it shouldBe evaluatorJob.ortRunId },`
`985`	`986`	`issues = withArg {`
`986`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", EvaluatorEndpoint.configPrefix) }`
	`987`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, EvaluatorEndpoint.configPrefix) }`
`987`	`988`	`}`
`988`	`989`	`)`
`989`	`990`	`}`
`@@ -1136,7 +1137,7 @@ class OrchestratorTest : WordSpec() {`
`1136`	`1137`	`ortRunRepository.update(`
`1137`	`1138`	`id = withArg { it shouldBe reporterJob.ortRunId },`
`1138`	`1139`	`issues = withArg {`
`1139`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", ReporterEndpoint.configPrefix) }`
	`1140`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, ReporterEndpoint.configPrefix) }`
`1140`	`1141`	`}`
`1141`	`1142`	`)`
`1142`	`1143`	`}`
`@@ -1272,7 +1273,7 @@ class OrchestratorTest : WordSpec() {`
`1272`	`1273`	`ortRunRepository.update(`
`1273`	`1274`	`id = withArg { it shouldBe notifierJob.ortRunId },`
`1274`	`1275`	`issues = withArg {`
`1275`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", NotifierEndpoint.configPrefix) }`
	`1276`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, NotifierEndpoint.configPrefix) }`
`1276`	`1277`	`}`
`1277`	`1278`	`)`
`1278`	`1279`	`}`
`@@ -1331,7 +1332,7 @@ class OrchestratorTest : WordSpec() {`
`1331`	`1332`	`ortRunRepository.update(`
`1332`	`1333`	`id = withArg { it shouldBe notifierJob.ortRunId },`
`1333`	`1334`	`issues = withArg {`
`1334`		`- verifyIssues(it) { verifyWorkerErrorIssues("ERROR", NotifierEndpoint.configPrefix) }`
	`1335`	`+ verifyIssues(it) { verifyWorkerErrorIssues(Severity.ERROR, NotifierEndpoint.configPrefix) }`
`1335`	`1336`	`}`
`1336`	`1337`	`)`
`1337`	`1338`	`}`
`@@ -1837,7 +1838,7 @@ fun verifyIssues(`
`1837`	`1838`	`issuesList.validate()`
`1838`	`1839`	`}`
`1839`	`1840`
`1840`		`-fun Collection<Issue>.verifyWorkerErrorIssues(severity: String, source: String) {`
	`1841`	`+fun Collection<Issue>.verifyWorkerErrorIssues(severity: Severity, source: String) {`
`1841`	`1842`	`shouldBeSingleton { issue ->`
`1842`	`1843`	`issue.severity shouldBe severity`
`1843`	`1844`	`issue.source shouldBe source`