From edff294530f4293a2ce29b24b8667c9ad6c8d9ee Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Wed, 3 Jul 2024 10:28:32 +0200 Subject: [PATCH] refactor(stack): Move two constants to the model Signed-off-by: Frank Viernau --- plugins/package-managers/stack/src/main/kotlin/Model.kt | 7 ++++++- plugins/package-managers/stack/src/main/kotlin/Stack.kt | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/package-managers/stack/src/main/kotlin/Model.kt b/plugins/package-managers/stack/src/main/kotlin/Model.kt index 80f8dbfafeb32..f6bb551b16467 100644 --- a/plugins/package-managers/stack/src/main/kotlin/Model.kt +++ b/plugins/package-managers/stack/src/main/kotlin/Model.kt @@ -28,7 +28,12 @@ import org.ossreviewtoolkit.model.jsonMapper internal data class Location( val url: String, val type: String -) +) { + companion object { + const val TYPE_HACKAGE = "hackage" + const val TYPE_PROJECT = "project package" + } +} @JsonIgnoreProperties(ignoreUnknown = true) internal data class Dependency( diff --git a/plugins/package-managers/stack/src/main/kotlin/Stack.kt b/plugins/package-managers/stack/src/main/kotlin/Stack.kt index 10250c7a1f545..58b1ca1c7c2ec 100644 --- a/plugins/package-managers/stack/src/main/kotlin/Stack.kt +++ b/plugins/package-managers/stack/src/main/kotlin/Stack.kt @@ -57,9 +57,6 @@ private const val TEST_SCOPE_NAME = "test" private const val BENCH_SCOPE_NAME = "bench" private val SCOPE_NAMES = setOf(EXTERNAL_SCOPE_NAME, TEST_SCOPE_NAME, BENCH_SCOPE_NAME) -private const val HACKAGE_PACKAGE_TYPE = "hackage" -private const val PROJECT_PACKAGE_TYPE = "project package" - /** * The [Stack](https://haskellstack.org/) package manager for Haskell. */ @@ -167,7 +164,7 @@ class Stack( version = version ) - if (location == null || location.type == HACKAGE_PACKAGE_TYPE) { + if (location == null || location.type == Location.TYPE_HACKAGE) { okHttpClient.downloadCabalFile(id)?.let { return parseCabalFile(it, "Hackage") } } @@ -179,7 +176,7 @@ class Stack( } } -private fun Dependency.isProject(): Boolean = location?.type == PROJECT_PACKAGE_TYPE +private fun Dependency.isProject(): Boolean = location?.type == Location.TYPE_PROJECT private fun Collection.toScope(scopeName: String, packageForName: Map): Scope { // TODO: Stack identifies dependencies only by name. Find out how dependencies with the same name but in @@ -189,7 +186,7 @@ private fun Collection.toScope(scopeName: String, packageForName: Ma return Scope( name = scopeName, dependencies = single { - it.location?.type == PROJECT_PACKAGE_TYPE + it.location?.type == Location.TYPE_PROJECT }.dependencies.mapTo(mutableSetOf()) { name -> dependencyForName.getValue(name).toPackageReference(dependencyForName, packageForName) }