Merge pull request #292 from kwebio/ktor_2.0-migration

Ktor 2.0 migration

Author: Derek52

build.gradle

@@ -21,11 +21,11 @@ plugins {
 apply plugin: "com.github.ben-manes.versions"
 
 ext {
-    ktor_version = '1.6.7'
+    ktor_version = '2.1.1'
 }
 
 group 'com.github.kwebio'
-version '0.11.4'
+version '0.11.6'
 
 repositories {
     mavenCentral()
@@ -56,9 +56,11 @@ dependencies {
     ////////////////////
     // Ktor dependencies
     ////////////////////
-    compile "io.ktor:ktor-server-core:$ktor_version"
     compile "io.ktor:ktor-server-jetty:$ktor_version"
-    compile "io.ktor:ktor-websockets:$ktor_version"
+    compile "io.ktor:ktor-server-websockets:$ktor_version"
+    compile "io.ktor:ktor-server-default-headers:$ktor_version"
+    compile "io.ktor:ktor-server-compression:$ktor_version"
+    compile "io.ktor:ktor-server-caching-headers:$ktor_version"
     compile "io.ktor:ktor-network-tls-certificates:$ktor_version"
 
     compile 'io.mola.galimatias:galimatias:0.2.1'

src/main/kotlin/kweb/KtorFeature.kt

@@ -1,11 +1,12 @@
 package kweb
 
-import io.ktor.application.Application
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
-import io.ktor.application.feature
-import io.ktor.routing.get
-import io.ktor.routing.routing
+import io.ktor.server.application.Application
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.call
+import io.ktor.server.application.plugin
+import io.ktor.server.application.*
+import io.ktor.server.routing.get
+import io.ktor.server.routing.routing
 import kweb.routing.PathReceiver
 
 /**
@@ -33,7 +34,7 @@ fun Application.installKwebOnRemainingRoutes(buildPage: WebBrowser.() -> Unit) {
  * @see kweb.demos.feature.kwebFeature
  */
 suspend fun ApplicationCall.respondKweb(buildPage: WebBrowser.() -> Unit) =
-    application.feature(Kweb).respondKweb(this, buildPage)
+    application.plugin(Kweb).respondKweb(this, buildPage)
 
 /**
  * If you were previously using Kweb routes and you want to switch to Ktor, this is for you.

src/main/kotlin/kweb/Kweb.kt

@@ -2,18 +2,20 @@ package kweb
 
 import com.google.common.cache.Cache
 import com.google.common.cache.CacheBuilder
-import io.ktor.application.*
-import io.ktor.features.*
+import io.ktor.server.application.*
+import io.ktor.server.plugins.*
 import io.ktor.http.*
-import io.ktor.http.cio.websocket.*
-import io.ktor.http.cio.websocket.Frame.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.websocket.*
+import io.ktor.websocket.Frame.*
+import io.ktor.server.request.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 import io.ktor.server.engine.*
 import io.ktor.server.jetty.*
+import io.ktor.server.plugins.defaultheaders.*
+import io.ktor.server.plugins.compression.*
+import io.ktor.server.websocket.*
 import io.ktor.util.*
-import io.ktor.websocket.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -105,7 +107,7 @@ class Kweb private constructor(
      *
      * @see kweb.demos.feature.kwebFeature for an example
      */
-    companion object Feature : ApplicationFeature<Application, Feature.Configuration, Kweb> {
+    companion object Feature : BaseApplicationPlugin<Application, Feature.Configuration, Kweb> {
         // Note that this is not KwebConfiguration, which is a different thing
         class Configuration {
             var debug: Boolean = true

src/main/kotlin/kweb/client/ClientConnection.kt

@@ -1,8 +1,8 @@
 package kweb.client
 
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.Frame.Text
-import io.ktor.http.cio.websocket.WebSocketSession
+import io.ktor.websocket.Frame
+import io.ktor.websocket.Frame.Text
+import io.ktor.websocket.WebSocketSession
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch

src/main/kotlin/kweb/client/HttpRequestInfo.kt

@@ -1,7 +1,7 @@
 package kweb.client
 
-import io.ktor.features.origin
-import io.ktor.request.ApplicationRequest
+import io.ktor.server.plugins.origin
+import io.ktor.server.request.ApplicationRequest
 
 /**
  * @param request This is the raw [ApplicationRequest](https://api.ktor.io/1.3.2/io.ktor.request/-application-request/index.html)

src/main/kotlin/kweb/config/KwebConfiguration.kt

@@ -1,8 +1,8 @@
 package kweb.config
 
-import io.ktor.application.*
+import io.ktor.server.application.*
 import io.ktor.http.*
-import io.ktor.response.*
+import io.ktor.server.response.*
 import kweb.Kweb
 import mu.KotlinLogging
 import java.time.Duration

src/main/kotlin/kweb/html/HtmlDocumentSupplier.kt

@@ -1,6 +1,6 @@
 package kweb.html
 
-import io.ktor.routing.*
+import io.ktor.server.routing.*
 import kweb.plugins.KwebPlugin
 import kweb.state.RenderSpanNames
 import org.jsoup.nodes.Document

src/main/kotlin/kweb/https/SSLConfig.kt

@@ -5,11 +5,10 @@ import io.ktor.network.tls.extensions.HashAlgorithm
 import io.ktor.network.tls.extensions.SignatureAlgorithm
 import io.ktor.server.engine.ConnectorType
 import io.ktor.server.engine.EngineSSLConnectorConfig
-import io.ktor.util.KtorExperimentalAPI
 import java.io.File
 import java.security.KeyStore
+import kotlin.text.toCharArray
 
-@KtorExperimentalAPI
 val defaultKeyStore by lazy {
     buildKeyStore {
         certificate("test") {
@@ -27,7 +26,9 @@ data class SSLConfig constructor(
         override val keyStorePath: File? = null,
         override val keyAlias: String = "mykey",
         override val keyStorePassword: () -> CharArray = { "changeit".toCharArray() },
-        override val privateKeyPassword: () -> CharArray = { "changeit".toCharArray() }
+        override val privateKeyPassword: () -> CharArray = { "changeit".toCharArray() },
+        override val trustStore: KeyStore? = null,
+        override val trustStorePath: File? = null
 ) : EngineSSLConnectorConfig {
     override val type: ConnectorType = ConnectorType.HTTPS
 }

src/main/kotlin/kweb/plugins/KwebPlugin.kt

@@ -1,6 +1,6 @@
 package kweb.plugins
 
-import io.ktor.routing.Routing
+import io.ktor.server.routing.Routing
 import kweb.Element
 import java.util.*
 import org.jsoup.nodes.Document as JSoupDocument

src/main/kotlin/kweb/plugins/staticFiles/StaticFilesPlugin.kt

@@ -1,11 +1,12 @@
 package kweb.plugins.staticFiles
 
-import io.ktor.application.install
-import io.ktor.features.CachingHeaders
+import io.ktor.server.application.install
+import io.ktor.server.plugins.cachingheaders.*
 import io.ktor.http.CacheControl
 import io.ktor.http.content.*
-import io.ktor.routing.Route
-import io.ktor.routing.Routing
+import io.ktor.server.http.content.*
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.Routing
 import kweb.plugins.KwebPlugin
 import java.io.File
 
@@ -42,7 +43,7 @@ class StaticFilesPlugin private constructor(private val servedRoute: String, pri
                 TODO: so that we can set a very long cache time (> 1 year).  For now it defaults
                 TODO: to one hour.
                  */
-                options {
+                options { call, content ->
                     CachingOptions(CacheControl.MaxAge(maxAgeSeconds = maxCacheAgeSeconds))
                 }
             }

src/main/kotlin/kweb/prelude.kt

@@ -1,6 +1,6 @@
 package kweb
 
-import io.ktor.routing.*
+import io.ktor.server.routing.*
 import io.mola.galimatias.URL
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*

src/main/kotlin/kweb/routing/RouteReceiver.kt

@@ -1,6 +1,6 @@
 package kweb.routing
 
-import io.ktor.routing.RoutingPath
+import io.ktor.server.routing.RoutingPath
 import kweb.h1
 
 class RouteReceiver internal constructor() {

src/main/kotlin/kweb/routing/routing.kt

@@ -1,6 +1,6 @@
 package kweb.routing
 
-import io.ktor.routing.*
+import io.ktor.server.routing.*
 import kweb.ElementCreator
 import kweb.Kweb
 import kweb.h1