Skip to content

Commit bad37ad

Browse files
committed
chore(model-server): remove deprecated ktor/html DSL usages
1 parent f9ea515 commit bad37ad

File tree

1 file changed

+17
-15
lines changed
  • model-server/src/main/kotlin/org/modelix/model/server

1 file changed

+17
-15
lines changed

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import io.ktor.server.application.call
2222
import io.ktor.server.application.install
2323
import io.ktor.server.engine.embeddedServer
2424
import io.ktor.server.html.respondHtmlTemplate
25-
import io.ktor.server.http.content.resources
26-
import io.ktor.server.http.content.static
25+
import io.ktor.server.http.content.staticResources
2726
import io.ktor.server.netty.Netty
2827
import io.ktor.server.netty.NettyApplicationEngine
2928
import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
@@ -44,6 +43,7 @@ import kotlinx.html.h1
4443
import kotlinx.html.li
4544
import kotlinx.html.style
4645
import kotlinx.html.ul
46+
import kotlinx.html.unsafe
4747
import org.apache.commons.io.FileUtils
4848
import org.apache.ignite.Ignition
4949
import org.modelix.authorization.KeycloakUtils
@@ -204,24 +204,26 @@ object Main {
204204
modelReplicationServer.init(this)
205205
metricsHandler.init(this)
206206
routing {
207-
static("/public") {
208-
resources("public")
209-
}
207+
staticResources("/public", "public")
210208
get("/") {
211209
call.respondHtmlTemplate(PageWithMenuBar("root", ".")) {
212210
headContent {
213211
style {
214-
+"""
215-
body {
216-
font-family: sans-serif;
217-
table {
218-
border-collapse: collapse;
219-
}
220-
td, th {
221-
border: 1px solid #888;
222-
padding: 3px 12px;
212+
unsafe {
213+
raw(
214+
"""
215+
body {
216+
font-family: sans-serif;
217+
table {
218+
border-collapse: collapse;
219+
}
220+
td, th {
221+
border: 1px solid #888;
222+
padding: 3px 12px;
223+
}
224+
""".trimIndent(),
225+
)
223226
}
224-
""".trimIndent()
225227
}
226228
}
227229
bodyContent {

0 commit comments

Comments
 (0)