Small refactor of initWebServer to improve readability.

This commit is contained in:
Clinton Alexander
2016-07-25 10:36:37 +01:00
parent fda2079611
commit 67defe19cc

View File

@ -102,7 +102,15 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
} }
// API, data upload and download to services (attachments, rates oracles etc) // API, data upload and download to services (attachments, rates oracles etc)
handlerCollection.addHandler(ServletContextHandler().apply { handlerCollection.addHandler(buildServletContextHandler())
server.handler = handlerCollection
server.start()
return server
}
private fun buildServletContextHandler(): ServletContextHandler {
return ServletContextHandler().apply {
contextPath = "/" contextPath = "/"
setAttribute("node", this@Node) setAttribute("node", this@Node)
addServlet(DataUploadServlet::class.java, "/upload/*") addServlet(DataUploadServlet::class.java, "/upload/*")
@ -139,11 +147,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
val jerseyServlet = ServletHolder(container) val jerseyServlet = ServletHolder(container)
addServlet(jerseyServlet, "/api/*") addServlet(jerseyServlet, "/api/*")
jerseyServlet.initOrder = 0 // Initialise at server start jerseyServlet.initOrder = 0 // Initialise at server start
}) }
server.handler = handlerCollection
server.start()
return server
} }
override fun start(): Node { override fun start(): Node {