From 9216c013ece22dd0bfdfff3fa6f139663ef5122e Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 18 May 2022 23:32:37 +0600
Subject: [PATCH] try to fix ktor update

---
 .../server/ClientStaticRoutingConfiguration.kt       | 12 +++++-------
 .../src/main/java/dev/inmo/postssystem/server/DI.kt  | 10 +++++-----
 .../server/NotFoundStatusPageRedirectToIndex.kt      | 10 +++++-----
 .../postssystem/server/WebSocketsConfigurator.kt     |  6 +++---
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/server/src/main/java/dev/inmo/postssystem/server/ClientStaticRoutingConfiguration.kt b/server/src/main/java/dev/inmo/postssystem/server/ClientStaticRoutingConfiguration.kt
index b00b41d8..8147919b 100644
--- a/server/src/main/java/dev/inmo/postssystem/server/ClientStaticRoutingConfiguration.kt
+++ b/server/src/main/java/dev/inmo/postssystem/server/ClientStaticRoutingConfiguration.kt
@@ -1,18 +1,16 @@
 package dev.inmo.postssystem.server
 
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import io.ktor.application.call
-import io.ktor.http.content.*
-import io.ktor.response.respondRedirect
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.http.content.defaultResource
+import io.ktor.server.http.content.resources
+import io.ktor.server.routing.Route
 import java.io.File
 
 class ClientStaticRoutingConfiguration(
     private val clientStatic: String?
 ) : ApplicationRoutingConfigurator.Element {
     override fun Route.invoke() {
-        resources("web")
-        defaultResource("/web/index.html")
+        resources(clientStatic)
+        defaultResource("${clientStatic ?.let { "/$it" } ?: ""}/index.html")
     }
 }
diff --git a/server/src/main/java/dev/inmo/postssystem/server/DI.kt b/server/src/main/java/dev/inmo/postssystem/server/DI.kt
index ed6f3ef6..e3bdacf5 100644
--- a/server/src/main/java/dev/inmo/postssystem/server/DI.kt
+++ b/server/src/main/java/dev/inmo/postssystem/server/DI.kt
@@ -32,10 +32,10 @@ import dev.inmo.postssystem.features.content.server.storage.*
 import dev.inmo.postssystem.features.posts.server.*
 import dev.inmo.postssystem.features.publication.server.PublicationManager
 import dev.inmo.postssystem.services.posts.server.*
-import io.ktor.application.featureOrNull
-import io.ktor.application.log
-import io.ktor.routing.Route
-import io.ktor.routing.Routing
+import io.ktor.server.application.pluginOrNull
+import io.ktor.server.application.log
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.Routing
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.server.netty.Netty
 import kotlinx.coroutines.CoroutineScope
@@ -194,7 +194,7 @@ fun getDIModule(
                     it.apply { configure() }
                 }
                 if (config.debugMode) {
-                    featureOrNull(Routing) ?.print()
+                    pluginOrNull(Routing) ?.print()
                 }
             }
         }
diff --git a/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt b/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt
index 4aee30fe..89f9aef8 100644
--- a/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt
+++ b/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt
@@ -1,16 +1,16 @@
 package dev.inmo.postssystem.server
 
 import dev.inmo.micro_utils.ktor.server.configurators.StatusPagesConfigurator
-import io.ktor.application.call
-import io.ktor.features.StatusPages
+import io.ktor.server.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.response.respondRedirect
+import io.ktor.server.plugins.statuspages.StatusPagesConfig
+import io.ktor.server.response.respondRedirect
 
 data class NotFoundStatusPageRedirectToIndex(
     val redirectTo: String
 ) : StatusPagesConfigurator.Element {
-    override fun StatusPages.Configuration.invoke() {
-        status(HttpStatusCode.NotFound) {
+    override fun StatusPagesConfig.invoke() {
+        status(HttpStatusCode.NotFound) { _ ->
             call.respondRedirect(redirectTo)
         }
     }
diff --git a/server/src/main/java/dev/inmo/postssystem/server/WebSocketsConfigurator.kt b/server/src/main/java/dev/inmo/postssystem/server/WebSocketsConfigurator.kt
index aa2e270b..03171343 100644
--- a/server/src/main/java/dev/inmo/postssystem/server/WebSocketsConfigurator.kt
+++ b/server/src/main/java/dev/inmo/postssystem/server/WebSocketsConfigurator.kt
@@ -1,9 +1,9 @@
 package dev.inmo.postssystem.server
 
 import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.websocket.WebSockets
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
+import io.ktor.server.websocket.WebSockets
 
 object WebSocketsConfigurator : KtorApplicationConfigurator {
     override fun Application.configure() {