From 67defe19cc28a2aecec9715dcfa0ed49603bbf9b Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Mon, 25 Jul 2016 10:36:37 +0100
Subject: [PATCH] Small refactor of initWebServer to improve readability.

---
 .../kotlin/com/r3corda/node/internal/Node.kt     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/node/src/main/kotlin/com/r3corda/node/internal/Node.kt b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt
index af24eff634..6949eafaae 100644
--- a/node/src/main/kotlin/com/r3corda/node/internal/Node.kt
+++ b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt
@@ -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)
-        handlerCollection.addHandler(ServletContextHandler().apply {
+        handlerCollection.addHandler(buildServletContextHandler())
+
+        server.handler = handlerCollection
+        server.start()
+        return server
+    }
+
+    private fun buildServletContextHandler(): ServletContextHandler {
+        return ServletContextHandler().apply {
             contextPath = "/"
             setAttribute("node", this@Node)
             addServlet(DataUploadServlet::class.java, "/upload/*")
@@ -139,11 +147,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
             val jerseyServlet = ServletHolder(container)
             addServlet(jerseyServlet, "/api/*")
             jerseyServlet.initOrder = 0 // Initialise at server start
-        })
-
-        server.handler = handlerCollection
-        server.start()
-        return server
+        }
     }
 
     override fun start(): Node {