Remove context receivers keeping raise DSL

Author: chrissearle

search/build.gradle.kts

@@ -17,10 +17,6 @@ application {
 
 kotlin {
     jvmToolchain(22)
-
-    compilerOptions {
-        freeCompilerArgs = listOf("-Xcontext-receivers")
-    }
 }
 
 repositories {

search/src/main/kotlin/no/java/conf/plugins/Respond.kt

@@ -3,7 +3,6 @@ package no.java.conf.plugins
 import arrow.core.Either
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.response.respond
-import io.ktor.server.response.respondRedirect
 import io.ktor.server.routing.RoutingContext
 import no.java.conf.model.ApiError
 
@@ -16,11 +15,3 @@ suspend inline fun <reified A : Any> Either<ApiError, A>.respond(
 }
 
 suspend fun RoutingContext.respond(error: ApiError) = call.respond(error.statusCode, error.messageMap())
-
-suspend inline fun <reified A : Any> Either<ApiError, A>.respondRedirect(
-    context: RoutingContext,
-    url: String
-) = when (this) {
-    is Either.Left -> context.respond(value)
-    is Either.Right -> context.call.respondRedirect(url)
-}

search/src/main/kotlin/no/java/conf/plugins/Search.kt

@@ -48,14 +48,15 @@ fun Application.configureSearchRouting(service: SearchService) {
 
             get("/videos") {
                 either {
-                    service.allVideos()
+                    service.allVideos(this)
                 }.respond(this)
             }
 
             post {
                 either {
                     service.textSearch(
-                        runCatching<TextSearchRequest?> { call.receiveNullable<TextSearchRequest>() }.getOrNull()
+                        runCatching<TextSearchRequest?> { call.receiveNullable<TextSearchRequest>() }.getOrNull(),
+                        this
                     )
                 }.respond(this)
             }

search/src/main/kotlin/no/java/conf/service/LocalFileService.kt

@@ -1,7 +1,6 @@
 package no.java.conf.service
 
 import io.github.oshai.kotlinlogging.KotlinLogging
-import io.ktor.client.request.get
 import kotlinx.serialization.json.Json
 import no.java.conf.config.LocalFileConfig
 import no.java.conf.model.sessions.Session
@@ -27,7 +26,7 @@ class LocalFileService(
         sessions =
             filenames
                 .map {
-                    val fileContent = javaClass.getResource(it.filename).readText()
+                    val fileContent = javaClass.getResource(it.filename)?.readText() ?: "[]"
 
                     val decodedSessions = json.decodeFromString<SPSessions>(fileContent)
 

search/src/main/kotlin/no/java/conf/service/SearchService.kt

@@ -78,24 +78,25 @@ class SearchService(
         readyState = State.INDEXED
     }
 
-    context(Raise<ApiError>)
-    suspend fun allVideos(): List<VideoSearchResponse> {
-        ensureReady(readyState)
+    suspend fun allVideos(raise: Raise<ApiError>): List<VideoSearchResponse> {
+        raise.ensureReady(readyState)
 
         return searcher.allVideos(INDEX_NAME)
     }
 
     fun state(): State = readyState
 
-    context(Raise<ApiError>)
-    suspend fun textSearch(searchRequest: TextSearchRequest?): SearchResponse {
-        ensureNotNull(searchRequest) {
-            raise(SearchMissing)
+    suspend fun textSearch(
+        searchRequest: TextSearchRequest?,
+        raise: Raise<ApiError>
+    ): SearchResponse {
+        raise.ensureNotNull(searchRequest) {
+            raise.raise(SearchMissing)
         }
 
-        ensureReady(readyState)
+        raise.ensureReady(readyState)
 
-        return searcher.textSearch(INDEX_NAME, searchRequest)
+        return searcher.textSearch(INDEX_NAME, searchRequest, raise)
     }
 }
 

search/src/main/kotlin/no/java/conf/service/search/ElasticSearcher.kt

@@ -38,7 +38,6 @@ private val logger = KotlinLogging.logger {}
 class ElasticSearcher(
     private val client: SearchClient,
 ) {
-    context(Raise<ApiError>)
     suspend fun allVideos(indexName: String): List<VideoSearchResponse> {
         val docCount = client.totalDocs(indexName)
 
@@ -51,10 +50,10 @@ class ElasticSearcher(
         return sessions.parseHits<VideoSearchResponse>().sortedBy { -it.year }
     }
 
-    context(Raise<ApiError>)
     suspend fun textSearch(
         indexName: String,
-        searchRequest: TextSearchRequest
+        searchRequest: TextSearchRequest,
+        raise: Raise<ApiError>
     ): SearchResponse {
         val docCount = client.totalDocs(indexName)
 
@@ -69,8 +68,8 @@ class ElasticSearcher(
                 logger.debug { this.json() }
             }
 
-        ensure(searchResult.aggregations != null) {
-            raise(AggregationsNotFound)
+        raise.ensure(searchResult.aggregations != null) {
+            raise.raise(AggregationsNotFound)
         }
 
         return SearchResponse(