From 0f983d9286107460eb0b168d4939b1d3dfe26068 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar 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 | 8 ++++---- .../server/NotFoundStatusPageRedirectToIndex.kt | 8 ++++---- .../postssystem/server/WebSocketsConfigurator.kt | 6 +++--- .../server/ServerPostsServiceRoutingConfigurator.kt | 4 ++-- 5 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..272c79e6 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.featureOrNull +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 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..676deb27 100644 --- a/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt +++ b/server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt @@ -1,15 +1,15 @@ 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() { + 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() { diff --git a/services/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/services/posts/server/ServerPostsServiceRoutingConfigurator.kt b/services/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/services/posts/server/ServerPostsServiceRoutingConfigurator.kt index ace41c12..b26f6857 100644 --- a/services/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/services/posts/server/ServerPostsServiceRoutingConfigurator.kt +++ b/services/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/services/posts/server/ServerPostsServiceRoutingConfigurator.kt @@ -17,8 +17,8 @@ import dev.inmo.postssystem.features.files.common.FileId import dev.inmo.postssystem.features.posts.common.* import dev.inmo.postssystem.services.posts.common.* import io.ktor.http.HttpStatusCode -import io.ktor.http.content.PartData -import io.ktor.http.content.streamProvider +import io.ktor.http.server.content.PartData +import io.ktor.http.server.content.streamProvider import io.ktor.server.application.ApplicationCall import io.ktor.server.application.call import io.ktor.server.auth.authenticate