Upgrading to Ktor 2 (#944)

craigatk · Dec 17, 2022 · 7b93913 · 7b93913
1 parent 06c4534
commit 7b93913
Show file tree

Hide file tree

Showing 37 changed files with 119 additions and 175 deletions.
diff --git a/server/server-app/build.gradle b/server/server-app/build.gradle
@@ -38,13 +38,17 @@ dependencies {
     implementation project(':server:persistence:object-store')
 
     implementation "io.ktor:ktor-server-netty:$ktor_version"
-    implementation "io.ktor:ktor-jackson:$ktor_version"
+    implementation "io.ktor:ktor-server-cors:$ktor_version"
+    implementation "io.ktor:ktor-server-caching-headers:$ktor_version"
+    implementation "io.ktor:ktor-server-compression:$ktor_version"
+    implementation "io.ktor:ktor-server-content-negotiation:$ktor_version"
+    implementation "io.ktor:ktor-serialization-jackson:$ktor_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
     implementation "io.insert-koin:koin-ktor:$koin_version"
     implementation "io.insert-koin:koin-logger-slf4j:$koin_version"
 
-    implementation "io.ktor:ktor-metrics-micrometer:$ktor_version"
+    implementation "io.ktor:ktor-server-metrics-micrometer:$ktor_version"
     implementation 'io.micrometer:micrometer-registry-influx:1.10.2'
 
     implementation "net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.42.0"

diff --git a/server/server-app/gradle.properties b/server/server-app/gradle.properties
@@ -1,4 +1,4 @@
-ktor_version=1.6.8
-koin_version=3.1.6
+ktor_version=2.2.1
+koin_version=3.2.2
 
 opentelemetry_version=1.13.0
diff --git a/server/server-app/src/main/kotlin/projektor/Application.kt b/server/server-app/src/main/kotlin/projektor/Application.kt
@@ -1,25 +1,25 @@
 package projektor
 
 import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.PropertyNamingStrategy
+import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.config.ApplicationConfig
-import io.ktor.features.*
 import io.ktor.http.CacheControl
 import io.ktor.http.ContentType
 import io.ktor.http.content.CachingOptions
-import io.ktor.jackson.jackson
-import io.ktor.metrics.micrometer.MicrometerMetrics
-import io.ktor.request.path
-import io.ktor.routing.*
+import io.ktor.serialization.jackson.*
+import io.ktor.server.application.*
+import io.ktor.server.config.*
+import io.ktor.server.metrics.micrometer.*
+import io.ktor.server.plugins.cachingheaders.*
+import io.ktor.server.plugins.compression.*
+import io.ktor.server.plugins.contentnegotiation.*
+import io.ktor.server.plugins.cors.routing.*
+import io.ktor.server.routing.*
 import io.micrometer.core.instrument.MeterRegistry
-import org.koin.ktor.ext.Koin
 import org.koin.ktor.ext.inject
+import org.koin.ktor.plugin.Koin
 import org.koin.logger.SLF4JLogger
-import org.slf4j.event.Level
 import projektor.attachment.AttachmentConfig
 import projektor.attachment.AttachmentDatabaseRepository
 import projektor.attachment.AttachmentRepository
@@ -60,7 +60,6 @@ import projektor.repository.performance.RepositoryPerformanceService
 import projektor.repository.testrun.RepositoryTestRunService
 import projektor.route.*
 import projektor.schedule.Scheduler
-import projektor.telemetry.OpenTelemetryRoute
 import projektor.testcase.TestCaseService
 import projektor.testrun.TestRunRepository
 import projektor.testrun.TestRunService
@@ -111,22 +110,17 @@ fun Application.main(meterRegistry: MeterRegistry? = null) {
     install(ContentNegotiation) {
         jackson {
             registerModule(JavaTimeModule())
-            propertyNamingStrategy = PropertyNamingStrategy.SNAKE_CASE
+            propertyNamingStrategy = PropertyNamingStrategies.SNAKE_CASE
             disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         }
     }
-    install(CallLogging) {
-        level = Level.INFO
-
-        filter { call -> !call.request.path().startsWith("/health") }
-    }
     install(Koin) {
         SLF4JLogger()
         modules(appModule)
     }
     install(CachingHeaders) {
-        options { outgoingContent ->
+        options { _, outgoingContent ->
             val oneDayInSeconds = 24 * 60 * 60
             when (outgoingContent.contentType?.withoutParameters()) {
                 ContentType.Application.JavaScript -> CachingOptions(CacheControl.MaxAge(maxAgeSeconds = 7 * oneDayInSeconds))
@@ -150,7 +144,6 @@ fun Application.main(meterRegistry: MeterRegistry? = null) {
             matchContentType(ContentType.Application.Json, ContentType.Application.JavaScript)
         }
     }
-    install(OpenTelemetryRoute)
     install(IgnoreTrailingSlash) // Needed to treat /tests/ and /tests as the same URL
 
     val authService: AuthService by inject()

diff --git a/server/server-app/src/main/kotlin/projektor/attachment/AttachmentConfig.kt b/server/server-app/src/main/kotlin/projektor/attachment/AttachmentConfig.kt
@@ -1,6 +1,6 @@
 package projektor.attachment
 
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 import java.math.BigDecimal
 
 data class AttachmentConfig(

diff --git a/server/server-app/src/main/kotlin/projektor/auth/AuthConfig.kt b/server/server-app/src/main/kotlin/projektor/auth/AuthConfig.kt
@@ -1,6 +1,6 @@
 package projektor.auth
 
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 
 data class AuthConfig(val publishToken: String?) {
     companion object {

diff --git a/server/server-app/src/main/kotlin/projektor/cleanup/CleanupConfig.kt b/server/server-app/src/main/kotlin/projektor/cleanup/CleanupConfig.kt
@@ -1,6 +1,6 @@
 package projektor.cleanup
 
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 
 data class CleanupConfig(
     val maxReportAgeDays: Int?,

diff --git a/server/server-app/src/main/kotlin/projektor/database/DataSourceConfig.kt b/server/server-app/src/main/kotlin/projektor/database/DataSourceConfig.kt
@@ -2,7 +2,7 @@ package projektor.database
 
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 import io.micrometer.core.instrument.MeterRegistry
 import org.flywaydb.core.Flyway
 import org.jooq.DSLContext

diff --git a/server/server-app/src/main/kotlin/projektor/message/MessageConfig.kt b/server/server-app/src/main/kotlin/projektor/message/MessageConfig.kt
@@ -1,6 +1,6 @@
 package projektor.message
 
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 
 data class MessageConfig(val globalMessages: List<String>) {
 

diff --git a/server/server-app/src/main/kotlin/projektor/metrics/InfluxMetricsConfig.kt b/server/server-app/src/main/kotlin/projektor/metrics/InfluxMetricsConfig.kt
@@ -1,6 +1,6 @@
 package projektor.metrics
 
-import io.ktor.config.ApplicationConfig
+import io.ktor.server.config.ApplicationConfig
 
 data class InfluxMetricsConfig(
     val enabled: Boolean,

diff --git a/server/server-app/src/main/kotlin/projektor/notification/NotificationConfig.kt b/server/server-app/src/main/kotlin/projektor/notification/NotificationConfig.kt
@@ -1,6 +1,6 @@
 package projektor.notification
 
-import io.ktor.config.*
+import io.ktor.server.config.*
 
 data class NotificationConfig(val serverBaseUrl: String?) {
     companion object {

diff --git a/server/server-app/src/main/kotlin/projektor/notification/github/GitHubNotificationConfig.kt b/server/server-app/src/main/kotlin/projektor/notification/github/GitHubNotificationConfig.kt
@@ -1,6 +1,6 @@
 package projektor.notification.github
 
-import io.ktor.config.*
+import io.ktor.server.config.*
 import projektor.notification.github.auth.PrivateKeyEncoder
 
 data class GitHubNotificationConfig(

diff --git a/server/server-app/src/main/kotlin/projektor/route/AttachmentRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/AttachmentRoutes.kt
@@ -1,15 +1,12 @@
 package projektor.route
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.request.header
-import io.ktor.request.receiveStream
-import io.ktor.response.respond
-import io.ktor.response.respondBytes
-import io.ktor.routing.Route
-import io.ktor.routing.get
-import io.ktor.routing.post
-import io.ktor.util.getOrFail
+import io.ktor.server.application.call
+import io.ktor.server.request.*
+import io.ktor.server.request.header
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import projektor.attachment.AddAttachmentResult

diff --git a/server/server-app/src/main/kotlin/projektor/route/BadgeRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/BadgeRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.badge.CoverageBadgeService
 import projektor.server.api.PublicId
 

diff --git a/server/server-app/src/main/kotlin/projektor/route/CodeQualityRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/CodeQualityRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.quality.CodeQualityReportRepository
 import projektor.server.api.PublicId
 import projektor.server.api.quality.CodeQualityReports

diff --git a/server/server-app/src/main/kotlin/projektor/route/CompressionRequest.kt b/server/server-app/src/main/kotlin/projektor/route/CompressionRequest.kt
@@ -1,8 +1,8 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.request.*
+import io.ktor.server.application.*
+import io.ktor.server.request.*
 import projektor.util.ungzip
 
 object CompressionRequest {

diff --git a/server/server-app/src/main/kotlin/projektor/route/ConfigRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/ConfigRoutes.kt
@@ -1,10 +1,9 @@
 package projektor.route
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 import projektor.cleanup.CleanupConfig
 import projektor.server.api.config.ServerCleanupConfig
 import projektor.server.api.config.ServerConfig

diff --git a/server/server-app/src/main/kotlin/projektor/route/CoverageRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/CoverageRoutes.kt
@@ -1,13 +1,11 @@
 package projektor.route
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.request.header
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.get
-import io.ktor.routing.post
-import io.ktor.util.getOrFail
+import io.ktor.server.application.*
+import io.ktor.server.request.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.getOrFail
 import projektor.auth.AuthConfig
 import projektor.auth.AuthService
 import projektor.coverage.CoverageService

diff --git a/server/server-app/src/main/kotlin/projektor/route/FailureRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/FailureRoutes.kt
@@ -1,9 +1,9 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 import projektor.error.ProcessingFailureService
 
 fun Route.failure(processingFailureService: ProcessingFailureService) {

diff --git a/server/server-app/src/main/kotlin/projektor/route/HealthRoute.kt b/server/server-app/src/main/kotlin/projektor/route/HealthRoute.kt
@@ -1,10 +1,9 @@
 package projektor.route
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 
 fun Route.health() {
     get("/health") {

diff --git a/server/server-app/src/main/kotlin/projektor/route/MessageRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/MessageRoutes.kt
@@ -1,11 +1,10 @@
 package projektor.route
 
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.get
-import io.ktor.util.getOrFail
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.message.MessageService
 import projektor.server.api.PublicId
 

diff --git a/server/server-app/src/main/kotlin/projektor/route/MetadataRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/MetadataRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.metadata.TestRunMetadataService
 import projektor.server.api.PublicId
 import projektor.versioncontrol.VersionControlConfig

diff --git a/server/server-app/src/main/kotlin/projektor/route/OrganizationRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/OrganizationRoutes.kt
@@ -1,9 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import io.ktor.util.*
 import projektor.organization.coverage.OrganizationCoverageService
 

diff --git a/server/server-app/src/main/kotlin/projektor/route/PerformanceRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/PerformanceRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.performance.PerformanceResultsService
 import projektor.server.api.PublicId
 import projektor.server.api.performance.PerformanceResults

diff --git a/server/server-app/src/main/kotlin/projektor/route/PreviousRunRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/PreviousRunRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.compare.PreviousTestRunService
 import projektor.server.api.PublicId
 

diff --git a/server/server-app/src/main/kotlin/projektor/route/RepositoryCoverageRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/RepositoryCoverageRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.compare.PreviousTestRunService
 import projektor.coverage.CoverageService
 import projektor.repository.coverage.RepositoryCoverageService

diff --git a/server/server-app/src/main/kotlin/projektor/route/RepositoryPerformanceRoutes.kt b/server/server-app/src/main/kotlin/projektor/route/RepositoryPerformanceRoutes.kt
@@ -1,10 +1,10 @@
 package projektor.route
 
-import io.ktor.application.*
 import io.ktor.http.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.util.*
 import projektor.repository.performance.RepositoryPerformanceService
 
 fun Route.repositoryPerformance(repositoryPerformanceService: RepositoryPerformanceService) {