|
@@ -1,19 +1,22 @@
|
|
|
package org.jetbrains.ktor.benchmarks
|
|
|
|
|
|
-import com.zaxxer.hikari.*
|
|
|
-import io.ktor.application.*
|
|
|
-import io.ktor.features.*
|
|
|
-import io.ktor.html.*
|
|
|
+import com.zaxxer.hikari.HikariConfig
|
|
|
+import com.zaxxer.hikari.HikariDataSource
|
|
|
import io.ktor.http.*
|
|
|
import io.ktor.http.content.*
|
|
|
-import io.ktor.response.*
|
|
|
-import io.ktor.routing.*
|
|
|
-import kotlinx.coroutines.*
|
|
|
+import io.ktor.server.application.*
|
|
|
+import io.ktor.server.html.*
|
|
|
+import io.ktor.server.plugins.defaultheaders.*
|
|
|
+import io.ktor.server.response.*
|
|
|
+import io.ktor.server.routing.*
|
|
|
+import kotlinx.coroutines.Dispatchers
|
|
|
+import kotlinx.coroutines.withContext
|
|
|
import kotlinx.html.*
|
|
|
-import kotlinx.serialization.*
|
|
|
-import kotlinx.serialization.builtins.*
|
|
|
-import kotlinx.serialization.json.*
|
|
|
-import java.util.concurrent.*
|
|
|
+import kotlinx.serialization.Serializable
|
|
|
+import kotlinx.serialization.builtins.ListSerializer
|
|
|
+import kotlinx.serialization.encodeToString
|
|
|
+import kotlinx.serialization.json.Json
|
|
|
+import java.util.concurrent.ThreadLocalRandom
|
|
|
|
|
|
@Serializable
|
|
|
data class Message(val message: String)
|
|
@@ -74,7 +77,8 @@ fun Application.main() {
|
|
|
when (queries) {
|
|
|
null -> Json.encodeToString(worldSerializer, result.single())
|
|
|
else -> Json.encodeToString(worldListSerializer, result)
|
|
|
- }, ContentType.Application.Json, HttpStatusCode.OK
|
|
|
+ },
|
|
|
+ ContentType.Application.Json, HttpStatusCode.OK
|
|
|
)
|
|
|
}
|
|
|
|
|
@@ -106,7 +110,6 @@ fun Application.main() {
|
|
|
td { +fortune.id.toString() }
|
|
|
td { +fortune.message }
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -130,7 +133,6 @@ fun Application.main() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
result.forEach { it.randomNumber = random.nextInt(dbRows) + 1 }
|
|
@@ -144,7 +146,6 @@ fun Application.main() {
|
|
|
updateStatement.executeUpdate()
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -152,7 +153,8 @@ fun Application.main() {
|
|
|
when (queries) {
|
|
|
null -> Json.encodeToString(worldSerializer, result.single())
|
|
|
else -> Json.encodeToString(worldListSerializer, result)
|
|
|
- }, ContentType.Application.Json, HttpStatusCode.OK
|
|
|
+ },
|
|
|
+ ContentType.Application.Json, HttpStatusCode.OK
|
|
|
)
|
|
|
}
|
|
|
}
|
|
@@ -189,4 +191,3 @@ fun ApplicationCall.queries() = try {
|
|
|
} catch (nfe: NumberFormatException) {
|
|
|
1
|
|
|
}
|
|
|
-
|