Chore/ktor3

common/ktor/src/main/kotlin/no/nav/mulighetsrommet/ktor/StartKtorApplication.kt

@@ -3,23 +3,15 @@ package no.nav.mulighetsrommet.ktor
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
-import org.slf4j.LoggerFactory
 
 fun startKtorApplication(config: ServerConfig, configure: Application.() -> Unit) {
     val loggerName = configure.javaClass.name.split('$').first()
 
     val server = embeddedServer(
         Netty,
-        environment = applicationEngineEnvironment {
-            log = LoggerFactory.getLogger(loggerName)
-
-            module(configure)
-
-            connector {
-                port = config.port
-                host = config.host
-            }
-        },
+        port = config.port,
+        host = config.host,
+        module = configure,
     )
 
     server.start(true)

common/ktor/src/main/kotlin/no/nav/mulighetsrommet/ktor/plugins/Monitoring.kt

@@ -6,7 +6,7 @@ import io.ktor.server.auth.*
 import io.ktor.server.auth.jwt.*
 import io.ktor.server.metrics.micrometer.*
 import io.ktor.server.plugins.callid.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ koin = "4.0.0"
 kotest = "5.9.1"
 kotest-testcontainers = "2.0.2"
 kotlin = "2.0.21"
-ktor = "2.3.12"
+ktor = "3.0.0"
 logback = "1.5.12"
 metrics = "4.2.28"
 arrow = "1.2.4"

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/okonomi/refusjon/ArrangorflateRoutes.kt

@@ -2,13 +2,11 @@ package no.nav.mulighetsrommet.api.okonomi.refusjon
 
 import arrow.core.getOrElse
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.plugins.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.util.*
-import io.ktor.util.pipeline.*
 import kotlinx.serialization.Serializable
 import no.nav.mulighetsrommet.api.okonomi.models.DeltakelsePeriode
 import no.nav.mulighetsrommet.api.okonomi.models.RefusjonKravBeregningAft
@@ -44,7 +42,7 @@ fun Route.arrangorflateRoutes() {
     val refusjonskrav: RefusjonskravRepository by inject()
     val deltakerRepository: DeltakerRepository by inject()
 
-    suspend fun <T : Any> PipelineContext<T, ApplicationCall>.arrangorerMedTilgang(): List<UUID> {
+    suspend fun RoutingContext.arrangorerMedTilgang(): List<UUID> {
         return call.principal<ArrangorflatePrincipal>()
             ?.organisasjonsnummer
             ?.map {
@@ -57,7 +55,7 @@ fun Route.arrangorflateRoutes() {
             ?: throw StatusException(HttpStatusCode.Unauthorized)
     }
 
-    fun <T : Any> PipelineContext<T, ApplicationCall>.requireTilgangHosArrangor(organisasjonsnummer: Organisasjonsnummer) {
+    fun RoutingContext.requireTilgangHosArrangor(organisasjonsnummer: Organisasjonsnummer) {
         call.principal<ArrangorflatePrincipal>()
             ?.organisasjonsnummer
             ?.find { it == organisasjonsnummer }

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/parameters/GetPaginationParams.kt

@@ -1,14 +1,13 @@
 package no.nav.mulighetsrommet.api.parameters
 
-import io.ktor.server.application.*
-import io.ktor.util.pipeline.*
+import io.ktor.server.routing.*
 import no.nav.mulighetsrommet.database.utils.Pagination
 
 const val FIRST_PAGE = 1
 
 const val DEFAULT_PAGE_SIZE = 50
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getPaginationParams(): Pagination {
+fun RoutingContext.getPaginationParams(): Pagination {
     return Pagination.of(
         page = call.parameters["page"]?.toIntOrNull() ?: FIRST_PAGE,
         size = call.parameters["size"]?.toIntOrNull() ?: DEFAULT_PAGE_SIZE,

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/plugins/Authentication.kt

@@ -55,7 +55,7 @@ fun Route.authenticate(
  * Gets a NAVident from the underlying [JWTPrincipal], or throws a [StatusException]
  * if the claim is not available.
  */
-fun <T : Any> PipelineContext<T, ApplicationCall>.getNavIdent(): NavIdent {
+fun RoutingContext.getNavIdent(): NavIdent {
     return call.principal<JWTPrincipal>()?.get("NAVident")?.let { NavIdent(it) } ?: throw StatusException(
         HttpStatusCode.Forbidden,
         "NAVident mangler i JWTPrincipal",
@@ -66,7 +66,7 @@ fun <T : Any> PipelineContext<T, ApplicationCall>.getNavIdent(): NavIdent {
  * Gets a NavAnsattAzureId from the underlying [JWTPrincipal], or throws a [StatusException]
  * if the claim is not available.
  */
-fun <T : Any> PipelineContext<T, ApplicationCall>.getNavAnsattAzureId(): UUID {
+fun RoutingContext.getNavAnsattAzureId(): UUID {
     return call.principal<JWTPrincipal>()?.get("oid")?.let { UUID.fromString(it) } ?: throw StatusException(
         HttpStatusCode.Forbidden,
         "NavAnsattAzureId mangler i JWTPrincipal",
@@ -77,7 +77,7 @@ fun <T : Any> PipelineContext<T, ApplicationCall>.getNavAnsattAzureId(): UUID {
  * Gets a pid from the underlying [JWTPrincipal], or throws a [StatusException]
  * if the claim is not available.
  */
-fun <T : Any> PipelineContext<T, ApplicationCall>.getPid(): NorskIdent {
+fun RoutingContext.getPid(): NorskIdent {
     return call.principal<JWTPrincipal>()?.get("pid")?.let { NorskIdent(it) } ?: throw StatusException(
         HttpStatusCode.Forbidden,
         "pid mangler i JWTPrincipal",

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/ArbeidsmarkedstiltakRoutes.kt

@@ -35,7 +35,7 @@ enum class ApentForInnsok {
     APENT_ELLER_STENGT,
 }
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getArbeidsmarkedstiltakFilter(): ArbeidsmarkedstiltakFilter {
+fun RoutingContext.getArbeidsmarkedstiltakFilter(): ArbeidsmarkedstiltakFilter {
     val queryParameters = call.request.queryParameters
 
     val enheter = queryParameters.getAll("enheter")

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/ArrangorRoutes.kt

@@ -104,7 +104,7 @@ data class ArrangorFilter(
     val sortering: String? = null,
 )
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getArrangorFilter(): ArrangorFilter {
+fun RoutingContext.getArrangorFilter(): ArrangorFilter {
     val til = call.request.queryParameters["til"]
     val sok = call.request.queryParameters["sok"]
     val sortering = call.request.queryParameters["sortering"]

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/AvtaleRoutes.kt

@@ -1,7 +1,6 @@
 package no.nav.mulighetsrommet.api.routes.v1
 
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -241,7 +240,7 @@ fun Route.avtaleRoutes() {
     }
 }
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getAvtaleFilter(): AvtaleFilter {
+fun RoutingContext.getAvtaleFilter(): AvtaleFilter {
     val tiltakstypeIder = call.parameters.getAll("tiltakstyper")?.map { it.toUUID() } ?: emptyList()
     val search = call.request.queryParameters["search"]
     val statuser = call.parameters.getAll("statuser")

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/ExternalRoutes.kt

@@ -1,7 +1,6 @@
 package no.nav.mulighetsrommet.api.routes.v1
 
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.util.*

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/JanzzRoutes.kt

@@ -1,6 +1,5 @@
 package no.nav.mulighetsrommet.api.routes.v1
 
-import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.util.*

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/NavAnsattRoutes.kt

@@ -4,7 +4,6 @@ import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.util.*
-import io.ktor.util.pipeline.*
 import no.nav.mulighetsrommet.api.domain.dbo.NavAnsattRolle
 import no.nav.mulighetsrommet.api.plugins.getNavAnsattAzureId
 import no.nav.mulighetsrommet.api.services.NavAnsattService
@@ -38,7 +37,7 @@ fun Route.navAnsattRoutes() {
     }
 }
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getNavAnsattFilter(): NavAnsattFilter {
+fun RoutingContext.getNavAnsattFilter(): NavAnsattFilter {
     val azureIder = call.parameters.getAll("roller")
         ?.map { NavAnsattRolle.valueOf(it) }
         ?: emptyList()

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/NavEnhetRoutes.kt

@@ -1,11 +1,9 @@
 package no.nav.mulighetsrommet.api.routes.v1
 
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.util.*
-import io.ktor.util.pipeline.*
 import no.nav.mulighetsrommet.api.clients.norg2.Norg2Type
 import no.nav.mulighetsrommet.api.domain.dbo.NavEnhetStatus
 import no.nav.mulighetsrommet.api.services.EnhetFilter
@@ -38,7 +36,7 @@ fun Route.navEnhetRoutes() {
     }
 }
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getEnhetFilter(): EnhetFilter {
+fun RoutingContext.getEnhetFilter(): EnhetFilter {
     val statuser = call.parameters.getAll("statuser")
         ?.map { NavEnhetStatus.valueOf(it) }
 

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/NotificationRoutes.kt

@@ -1,7 +1,6 @@
 package no.nav.mulighetsrommet.api.routes.v1
 
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -61,7 +60,7 @@ data class SetNotificationStatusRequest(
     )
 }
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getNotificationFilter(): NotificationFilter {
+fun RoutingContext.getNotificationFilter(): NotificationFilter {
     val status = call.request.queryParameters["status"]
     return NotificationFilter(
         status = status?.let { NotificationStatus.valueOf(it) },

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/TiltaksgjennomforingRoutes.kt

@@ -200,7 +200,7 @@ data class AdminTiltaksgjennomforingFilter(
     val publisert: Boolean? = null,
 )
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getAdminTiltaksgjennomforingsFilter(): AdminTiltaksgjennomforingFilter {
+fun RoutingContext.getAdminTiltaksgjennomforingsFilter(): AdminTiltaksgjennomforingFilter {
     val search = call.request.queryParameters["search"]
     val navEnheter = call.parameters.getAll("navEnheter") ?: emptyList()
     val tiltakstypeIder = call.parameters.getAll("tiltakstyper")?.map { UUID.fromString(it) } ?: emptyList()

mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/routes/v1/TiltakstypeRoutes.kt

@@ -60,7 +60,7 @@ data class TiltakstypeFilter(
     val sortering: String? = null,
 )
 
-fun <T : Any> PipelineContext<T, ApplicationCall>.getTiltakstypeFilter(): TiltakstypeFilter {
+fun RoutingContext.getTiltakstypeFilter(): TiltakstypeFilter {
     val sortering = call.request.queryParameters["sort"]
     return TiltakstypeFilter(
         sortering = sortering,