From afd9e33632914ecf76f6413aa893907bdb569b9c Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Fri, 9 Aug 2024 10:38:44 +0200
Subject: [PATCH] chore: code cleanup
---
.../iem/app/gitlab/service/OpenCodeGitlabApi.kt | 2 +-
.../fraunhofer/iem/app/tool/enumeration/ToolType.kt | 1 +
.../iem/app/toolRun/service/ToolRunService.kt | 3 ---
.../tools/gitlab/service/RepositoryDetailsService.kt | 2 +-
.../iem/app/tools/occmd/json/SecretResultsJson.kt | 10 ----------
.../iem/app/tools/occmd/json/ToolSecretJson.kt | 12 ------------
.../iem/app/tools/occmd/json/ToolSecretResultJson.kt | 12 ------------
.../iem/kpiCalculator/adapter/vcs/VcsAdapter.kt | 2 +-
.../model/adapter/vcs/RepositoryDetailsDto.kt | 2 +-
9 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt
delete mode 100644 app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt
delete mode 100644 app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
index 7f30cd69..8b408752 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
@@ -6,7 +6,7 @@ import de.fraunhofer.iem.app.gitlab.dto.MemberDto
import de.fraunhofer.iem.app.gitlab.enumeration.AccessLevel
import de.fraunhofer.iem.app.logger.getLogger
import de.fraunhofer.iem.app.repository.dto.RepositoryCreateDto
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
import kotlinx.coroutines.*
import org.gitlab4j.api.GitLabApi
import org.gitlab4j.api.models.Commit
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
index 0dc3b489..19762282 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
@@ -4,6 +4,7 @@ import de.fraunhofer.iem.app.kpi.enumeration.getName
import de.fraunhofer.iem.app.tool.dto.ToolDto
import de.fraunhofer.iem.kpiCalculator.model.kpi.KpiId
+//XXX: this can be refactored once we have a list of supported tools in the library
enum class ToolType {
ORT {
override fun toViewModel(): ToolDto {
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
index ea1ae181..05336fa4 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
@@ -148,7 +148,6 @@ class ToolRunService(
repositoryService.getToolRunByProjectId(projectId = projectId)
}
-
val apiJobs: MutableList<Job> = mutableListOf()
if (includeFindings) {
@@ -181,6 +180,4 @@ class ToolRunService(
return toolRun
}
-
-
}
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
index 9abf37e2..866165b4 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
@@ -1,9 +1,9 @@
package de.fraunhofer.iem.app.tools.gitlab.service
import de.fraunhofer.iem.app.gitlab.service.OpenCodeGitlabApi
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
import de.fraunhofer.iem.app.tool.dto.CreateToolDto
import de.fraunhofer.iem.app.tool.enumeration.ToolType
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
import org.springframework.stereotype.Service
@Service
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt
deleted file mode 100644
index 511401a6..00000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class SecretResultsJson(
- @SerialName("tool_secrets")
- val toolSecrets: List<ToolSecretJson> = listOf()
-)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt
deleted file mode 100644
index 9f0f0653..00000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ToolSecretJson(
- @SerialName("name")
- val name: String,
- @SerialName("secrets")
- val secrets: List<String> = mutableListOf()
-)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt
deleted file mode 100644
index 4be78541..00000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ToolSecretResultJson(
- @SerialName("name")
- val name: String,
- @SerialName("secrets")
- val toolSecrets: List<ToolSecretJson> = listOf()
-)
diff --git a/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt b/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
index 4d796967..b87799fb 100644
--- a/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
+++ b/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
@@ -1,9 +1,9 @@
package de.fraunhofer.iem.kpiCalculator.adapter.vcs
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
import de.fraunhofer.iem.kpiCalculator.adapter.KpiAdapter
import de.fraunhofer.iem.kpiCalculator.model.adapter.AdapterResult
import de.fraunhofer.iem.kpiCalculator.model.adapter.ErrorType
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
import de.fraunhofer.iem.kpiCalculator.model.kpi.KpiId
import de.fraunhofer.iem.kpiCalculator.model.kpi.RawValueKpi
diff --git a/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt b/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
index 11728527..7966827d 100644
--- a/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
+++ b/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
@@ -1,4 +1,4 @@
-package de.fraunhofer.iem.app.repository.dto
+package de.fraunhofer.iem.kpiCalculator.model.adapter.vcs
data class RepositoryDetailsDto(
val projectId: Long,
--
GitLab