From 85b24f35a80cc0ccf3d465357833780d05330917 Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Fri, 23 Jun 2023 18:15:08 +0200
Subject: [PATCH] fixed incorrect parsing of sarif occmd results
---
.../taskManager/tasks/tools/occmd/json/sarif/OccmdSarif.kt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/taskManager/tasks/tools/occmd/json/sarif/OccmdSarif.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/taskManager/tasks/tools/occmd/json/sarif/OccmdSarif.kt
index 93d4d882..6358808d 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/taskManager/tasks/tools/occmd/json/sarif/OccmdSarif.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/taskManager/tasks/tools/occmd/json/sarif/OccmdSarif.kt
@@ -2,12 +2,11 @@ package de.fraunhofer.iem.dataprovider.taskManager.tasks.tools.occmd.json.sarif
import de.fraunhofer.iem.dataprovider.taskManager.tasks.tools.occmd.json.raw.OccmdRaw
import de.fraunhofer.iem.dataprovider.taskManager.tasks.tools.sarif.json.*
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
import java.io.IOException
import java.nio.file.Path
-
fun getOccmdSarifFromFilePath(resultPath: Path): SarifJson {
val resFile = resultPath.toFile()
if (resFile.exists()) {
@@ -22,7 +21,7 @@ fun getOccmdSarifFromFilePath(resultPath: Path): SarifJson {
}
private fun occmdRawToSarif(occmdRaw: OccmdRaw): SarifJson {
- val tool = SarifToolJson(SarifDriverJson("OCCMD", occmdRaw.version, "en-us"))
+ val tool = SarifToolJson(SarifDriverJson(name = "OCCMD", version = occmdRaw.version))
val results: MutableList<SarifResultJson> = mutableListOf()
--
GitLab