diff --git a/core/src/main/kotlin/api/RunsRoute.kt b/core/src/main/kotlin/api/RunsRoute.kt index 9d1c37bd3..d6808e3b2 100644 --- a/core/src/main/kotlin/api/RunsRoute.kt +++ b/core/src/main/kotlin/api/RunsRoute.kt @@ -64,9 +64,9 @@ import org.eclipse.apoapsis.ortserver.core.utils.requireIdParameter import org.eclipse.apoapsis.ortserver.core.utils.requireParameter import org.eclipse.apoapsis.ortserver.dao.QueryParametersException import org.eclipse.apoapsis.ortserver.logaccess.LogFileService -import org.eclipse.apoapsis.ortserver.logaccess.LogLevel -import org.eclipse.apoapsis.ortserver.logaccess.LogSource import org.eclipse.apoapsis.ortserver.model.JobStatus +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource import org.eclipse.apoapsis.ortserver.model.OrtRun import org.eclipse.apoapsis.ortserver.model.VulnerabilityWithIdentifier import org.eclipse.apoapsis.ortserver.model.authorization.RepositoryPermission diff --git a/core/src/main/kotlin/apiDocs/RunsDocs.kt b/core/src/main/kotlin/apiDocs/RunsDocs.kt index b6c665eeb..bdb805475 100644 --- a/core/src/main/kotlin/apiDocs/RunsDocs.kt +++ b/core/src/main/kotlin/apiDocs/RunsDocs.kt @@ -54,8 +54,8 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.Vulnerability import org.eclipse.apoapsis.ortserver.api.v1.model.VulnerabilityRating import org.eclipse.apoapsis.ortserver.api.v1.model.VulnerabilityReference import org.eclipse.apoapsis.ortserver.api.v1.model.VulnerabilityWithIdentifier -import org.eclipse.apoapsis.ortserver.logaccess.LogLevel -import org.eclipse.apoapsis.ortserver.logaccess.LogSource +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource val getOrtRunById: OpenApiRoute.() -> Unit = { operationId = "getOrtRunById" diff --git a/core/src/test/kotlin/api/RunsRouteIntegrationTest.kt b/core/src/test/kotlin/api/RunsRouteIntegrationTest.kt index 6d51ad7c5..26d2d0479 100644 --- a/core/src/test/kotlin/api/RunsRouteIntegrationTest.kt +++ b/core/src/test/kotlin/api/RunsRouteIntegrationTest.kt @@ -89,13 +89,13 @@ import org.eclipse.apoapsis.ortserver.core.shouldHaveBody import org.eclipse.apoapsis.ortserver.dao.utils.toDatabasePrecision import org.eclipse.apoapsis.ortserver.logaccess.LogFileCriteria import org.eclipse.apoapsis.ortserver.logaccess.LogFileProviderFactoryForTesting -import org.eclipse.apoapsis.ortserver.logaccess.LogLevel -import org.eclipse.apoapsis.ortserver.logaccess.LogSource import org.eclipse.apoapsis.ortserver.model.AdvisorJobConfiguration import org.eclipse.apoapsis.ortserver.model.AnalyzerJobConfiguration import org.eclipse.apoapsis.ortserver.model.EvaluatorJobConfiguration import org.eclipse.apoapsis.ortserver.model.JobConfigurations import org.eclipse.apoapsis.ortserver.model.JobStatus +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource import org.eclipse.apoapsis.ortserver.model.OrtRun import org.eclipse.apoapsis.ortserver.model.OrtRunStatus import org.eclipse.apoapsis.ortserver.model.PluginConfiguration diff --git a/logaccess/loki/build.gradle.kts b/logaccess/loki/build.gradle.kts index 638c7632b..f351fe7cf 100644 --- a/logaccess/loki/build.gradle.kts +++ b/logaccess/loki/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { api(libs.typesafeConfig) implementation(projects.logaccess.logaccessSpi) + implementation(projects.model) implementation(projects.utils.config) implementation(libs.ktorClientAuth) diff --git a/logaccess/loki/src/main/kotlin/LokiLogFileProvider.kt b/logaccess/loki/src/main/kotlin/LokiLogFileProvider.kt index dd92b675a..8c95f76ef 100644 --- a/logaccess/loki/src/main/kotlin/LokiLogFileProvider.kt +++ b/logaccess/loki/src/main/kotlin/LokiLogFileProvider.kt @@ -40,8 +40,8 @@ import kotlinx.datetime.Instant import kotlinx.serialization.json.Json import org.eclipse.apoapsis.ortserver.logaccess.LogFileProvider -import org.eclipse.apoapsis.ortserver.logaccess.LogLevel -import org.eclipse.apoapsis.ortserver.logaccess.LogSource +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource import org.slf4j.LoggerFactory diff --git a/logaccess/loki/src/test/kotlin/LokiLogFileProviderTest.kt b/logaccess/loki/src/test/kotlin/LokiLogFileProviderTest.kt index 8d3524259..5e98912c1 100644 --- a/logaccess/loki/src/test/kotlin/LokiLogFileProviderTest.kt +++ b/logaccess/loki/src/test/kotlin/LokiLogFileProviderTest.kt @@ -58,8 +58,8 @@ import kotlinx.datetime.Instant import org.eclipse.apoapsis.ortserver.config.ConfigManager import org.eclipse.apoapsis.ortserver.logaccess.LogFileService -import org.eclipse.apoapsis.ortserver.logaccess.LogLevel -import org.eclipse.apoapsis.ortserver.logaccess.LogSource +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource class LokiLogFileProviderTest : StringSpec() { private val server = WireMockServer(WireMockConfiguration.options().dynamicPort()) diff --git a/logaccess/spi/build.gradle.kts b/logaccess/spi/build.gradle.kts index 59463e981..6e8efe4f0 100644 --- a/logaccess/spi/build.gradle.kts +++ b/logaccess/spi/build.gradle.kts @@ -30,9 +30,11 @@ group = "org.eclipse.apoapsis.ortserver.logaccess" dependencies { api(projects.config.configSpi) + api(projects.model) api(libs.kotlinxDatetime) + implementation(projects.model) implementation(projects.utils.config) implementation(libs.kotlinxCoroutines) @@ -46,5 +48,6 @@ dependencies { testImplementation(libs.kotestRunnerJunit5) testImplementation(libs.mockk) + testFixturesImplementation(projects.model) testFixturesImplementation(projects.utils.config) } diff --git a/logaccess/spi/src/main/kotlin/LogFileProvider.kt b/logaccess/spi/src/main/kotlin/LogFileProvider.kt index 38b16a38d..7f1c79260 100644 --- a/logaccess/spi/src/main/kotlin/LogFileProvider.kt +++ b/logaccess/spi/src/main/kotlin/LogFileProvider.kt @@ -23,6 +23,9 @@ import java.io.File import kotlinx.datetime.Instant +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource + /** * The Service Provider Interface for the log file provider abstraction. * diff --git a/logaccess/spi/src/main/kotlin/LogFileService.kt b/logaccess/spi/src/main/kotlin/LogFileService.kt index 14d52cb5b..af0ca16ce 100644 --- a/logaccess/spi/src/main/kotlin/LogFileService.kt +++ b/logaccess/spi/src/main/kotlin/LogFileService.kt @@ -32,6 +32,8 @@ import kotlinx.datetime.Instant import org.eclipse.apoapsis.ortserver.config.ConfigManager import org.eclipse.apoapsis.ortserver.config.Path as ConfigPath +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource import org.eclipse.apoapsis.ortserver.utils.config.getStringOrNull import org.ossreviewtoolkit.utils.common.packZip diff --git a/logaccess/spi/src/test/kotlin/LogFileServiceTest.kt b/logaccess/spi/src/test/kotlin/LogFileServiceTest.kt index 9e6b1b92d..80f2e625b 100644 --- a/logaccess/spi/src/test/kotlin/LogFileServiceTest.kt +++ b/logaccess/spi/src/test/kotlin/LogFileServiceTest.kt @@ -39,6 +39,8 @@ import java.util.EnumSet import kotlinx.datetime.Instant import org.eclipse.apoapsis.ortserver.config.ConfigManager +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource import org.ossreviewtoolkit.utils.common.unpack diff --git a/logaccess/spi/src/test/kotlin/LogLevelTest.kt b/logaccess/spi/src/test/kotlin/LogLevelTest.kt index 94ea01d2f..3a502cda7 100644 --- a/logaccess/spi/src/test/kotlin/LogLevelTest.kt +++ b/logaccess/spi/src/test/kotlin/LogLevelTest.kt @@ -22,6 +22,8 @@ package org.eclipse.apoapsis.ortserver.logaccess import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder +import org.eclipse.apoapsis.ortserver.model.LogLevel + class LogLevelTest : WordSpec({ "levelOrHigher" should { "return a correct set for the ERROR level" { diff --git a/logaccess/spi/src/testFixtures/kotlin/LogFileProviderFactoryForTesting.kt b/logaccess/spi/src/testFixtures/kotlin/LogFileProviderFactoryForTesting.kt index 1a09370cb..725b82f96 100644 --- a/logaccess/spi/src/testFixtures/kotlin/LogFileProviderFactoryForTesting.kt +++ b/logaccess/spi/src/testFixtures/kotlin/LogFileProviderFactoryForTesting.kt @@ -26,6 +26,8 @@ import java.util.EnumSet import kotlinx.datetime.Instant import org.eclipse.apoapsis.ortserver.config.ConfigManager +import org.eclipse.apoapsis.ortserver.model.LogLevel +import org.eclipse.apoapsis.ortserver.model.LogSource /** * An implementation of [LogFileProviderFactory] that can be used to test interactions with log file providers. diff --git a/logaccess/spi/src/main/kotlin/LogLevel.kt b/model/src/commonMain/kotlin/LogLevel.kt similarity index 97% rename from logaccess/spi/src/main/kotlin/LogLevel.kt rename to model/src/commonMain/kotlin/LogLevel.kt index 82c787d0d..863a2b94d 100644 --- a/logaccess/spi/src/main/kotlin/LogLevel.kt +++ b/model/src/commonMain/kotlin/LogLevel.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.eclipse.apoapsis.ortserver.logaccess +package org.eclipse.apoapsis.ortserver.model import java.util.EnumSet diff --git a/logaccess/spi/src/main/kotlin/LogSource.kt b/model/src/commonMain/kotlin/LogSource.kt similarity index 97% rename from logaccess/spi/src/main/kotlin/LogSource.kt rename to model/src/commonMain/kotlin/LogSource.kt index 5791cf4ab..47681a37b 100644 --- a/logaccess/spi/src/main/kotlin/LogSource.kt +++ b/model/src/commonMain/kotlin/LogSource.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.eclipse.apoapsis.ortserver.logaccess +package org.eclipse.apoapsis.ortserver.model /** * An enumeration class that defines the different sources for which log files can be downloaded. The sources