Update kotlin + gradle + dependencies

This commit is contained in:
2021-02-06 01:05:33 +01:00
parent 69e50b158f
commit 525e3a4a3f
10 changed files with 28 additions and 32 deletions
-1
View File
@@ -1,6 +1,5 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
<pattern>%cyan(%d{YYYY-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %green(%logger{36}) - %msg%n
</pattern>
+2 -5
View File
@@ -11,7 +11,6 @@ import org.http4k.server.ServerConfig
import org.http4k.servlet.asServlet
class Jetty(private val port: Int, private val server: Server) : ServerConfig {
constructor(port: Int = 8000) : this(port, http(port))
constructor(port: Int, vararg inConnectors: ConnectorBuilder) : this(
port,
Server().apply {
@@ -19,8 +18,8 @@ class Jetty(private val port: Int, private val server: Server) : ServerConfig {
}
)
override fun toServer(httpHandler: HttpHandler): Http4kServer {
server.insertHandler(httpHandler.toJettyHandler())
override fun toServer(http: HttpHandler): Http4kServer {
server.insertHandler(http.toJettyHandler())
return object : Http4kServer {
override fun start(): Http4kServer = apply {
@@ -39,5 +38,3 @@ fun HttpHandler.toJettyHandler() = ServletContextHandler(SESSIONS).apply {
}
typealias ConnectorBuilder = (Server) -> ServerConnector
fun http(httpPort: Int): ConnectorBuilder = { server: Server -> ServerConnector(server).apply { port = httpPort } }