Linting/tidy

Author: chrissearle

src/main/kotlin/no/java/conf/model/search/TextSearchRequest.kt

@@ -1,7 +1,6 @@
 package no.java.conf.model.search
 
 import kotlinx.serialization.Serializable
-import no.java.conf.model.sessions.Format
 
 @Serializable
 data class TextSearchRequest(

src/main/kotlin/no/java/conf/plugins/LocalFile.kt

@@ -1,22 +1,18 @@
 package no.java.conf.plugins
 
-import io.ktor.client.HttpClient
 import io.ktor.server.application.Application
-import no.java.conf.model.EndpointConfig
 import no.java.conf.service.LocalFileConfig
 import no.java.conf.service.LocalFileService
-import no.java.conf.service.SleepingPillService
 
+fun localFileService(config: List<LocalFileConfig>) =
+    LocalFileService(
+        filenames = config,
+    )
 
-fun localFileService(
-    config: List<LocalFileConfig>
-) = LocalFileService(
-    filenames = config,
-)
-
-
-fun Application.localFileService() = localFileService(
-    config = environment.config.configList("javazone.localfile").map {
-        LocalFileConfig(it.property("year").getString().toInt(), it.property("filename").getString())
-    },
-)
+fun Application.localFileService() =
+    localFileService(
+        config =
+            environment.config.configList("javazone.localfile").map {
+                LocalFileConfig(it.property("year").getString().toInt(), it.property("filename").getString())
+            },
+    )

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

@@ -14,7 +14,12 @@ import io.ktor.server.routing.routing
 import no.java.conf.model.search.TextSearchRequest
 import no.java.conf.service.SearchService
 
-fun searchClient(host: String, port: Int, username: String, password: String) = SearchClient(
+fun searchClient(
+    host: String,
+    port: Int,
+    username: String,
+    password: String
+) = SearchClient(
     KtorRestClient(
         host = host,
         port = port,
@@ -23,31 +28,36 @@ fun searchClient(host: String, port: Int, username: String, password: String) =
     ),
 )
 
-fun Application.searchClient() = searchClient(
-    host = environment.config.property("elastic.host").getString(),
-    port = environment.config
-        .property("elastic.port")
-        .getString()
-        .toInt(),
-    username = environment.config.property("elastic.username").getString(),
-    password = environment.config.property("elastic.password").getString(),
-)
-
-fun searchService(searchClient: SearchClient, skipIndex: Boolean) =
-    SearchService(
-        client = searchClient,
-        skipIndex = skipIndex,
+fun Application.searchClient() =
+    searchClient(
+        host = environment.config.property("elastic.host").getString(),
+        port =
+            environment.config
+                .property("elastic.port")
+                .getString()
+                .toInt(),
+        username = environment.config.property("elastic.username").getString(),
+        password = environment.config.property("elastic.password").getString(),
     )
 
-
-fun Application.searchService() = searchService(
-    searchClient = searchClient(),
-    skipIndex = environment.config
-        .property("elastic.skipindex")
-        .getString()
-        .toBoolean()
+fun searchService(
+    searchClient: SearchClient,
+    skipIndex: Boolean
+) = SearchService(
+    client = searchClient,
+    skipIndex = skipIndex,
 )
 
+fun Application.searchService() =
+    searchService(
+        searchClient = searchClient(),
+        skipIndex =
+            environment.config
+                .property("elastic.skipindex")
+                .getString()
+                .toBoolean()
+    )
+
 fun Application.configureSearchRouting(service: SearchService) {
     routing {
         route("/api/search") {

src/main/kotlin/no/java/conf/plugins/SleepingPill.kt

@@ -5,7 +5,6 @@ import io.ktor.server.application.Application
 import no.java.conf.model.EndpointConfig
 import no.java.conf.service.SleepingPillService
 
-
 fun sleepingPillService(
     httpClient: HttpClient,
     endpoints: List<EndpointConfig>
@@ -14,12 +13,11 @@ fun sleepingPillService(
     endpoints = endpoints,
 )
 
-
-fun Application.sleepingPillService(
-    httpClient: HttpClient,
-) = sleepingPillService(
-    httpClient = httpClient,
-    endpoints = environment.config.configList("javazone.sleepingpill").map {
-        EndpointConfig(it.property("year").getString().toInt(), it.property("endpoint").getString())
-    },
-)
+fun Application.sleepingPillService(httpClient: HttpClient) =
+    sleepingPillService(
+        httpClient = httpClient,
+        endpoints =
+            environment.config.configList("javazone.sleepingpill").map {
+                EndpointConfig(it.property("year").getString().toInt(), it.property("endpoint").getString())
+            },
+    )

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

@@ -1,16 +1,9 @@
 package no.java.conf.service
 
 import io.github.oshai.kotlinlogging.KotlinLogging
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
 import io.ktor.client.request.get
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
 import kotlinx.serialization.json.Json
-import no.java.conf.model.EndpointConfig
 import no.java.conf.model.sessions.Session
-import no.java.conf.model.sleepingpill.SPSession
 import no.java.conf.model.sleepingpill.SPSessions
 import no.java.conf.model.sleepingpill.toSession
 
@@ -26,28 +19,31 @@ class LocalFileService(
 ) {
     private lateinit var sessions: List<Session>
 
-    private val json = Json {
-        prettyPrint = true
-        ignoreUnknownKeys = true
-        isLenient = true
-        explicitNulls = false
-    }
+    private val json =
+        Json {
+            prettyPrint = true
+            ignoreUnknownKeys = true
+            isLenient = true
+            explicitNulls = false
+        }
 
     fun read(): List<Session> {
-        sessions = filenames.map {
-            val fileContent = javaClass.getResource(it.filename).readText()
-
-            val decodedSessions =  json.decodeFromString<SPSessions>(fileContent)
-
-            decodedSessions.sessions.map { session ->
-                session.toSession(it.year).copy(
-                    id = "Local-${it.year}-${session.id}",
-                    sessionId = "Local-${it.year}-${session.id}",
-                    conferenceId = "Local-${it.year}",
-                )
-            }
-
-        }.flatten().also { logger.debug { "Local File - sessions: ${it.count()}" } }
+        sessions =
+            filenames
+                .map {
+                    val fileContent = javaClass.getResource(it.filename).readText()
+
+                    val decodedSessions = json.decodeFromString<SPSessions>(fileContent)
+
+                    decodedSessions.sessions.map { session ->
+                        session.toSession(it.year).copy(
+                            id = "Local-${it.year}-${session.id}",
+                            sessionId = "Local-${it.year}-${session.id}",
+                            conferenceId = "Local-${it.year}",
+                        )
+                    }
+                }.flatten()
+                .also { logger.debug { "Local File - sessions: ${it.count()}" } }
 
         return sessions
     }