Moved JsonSupport to new webserver module. Fixed a few compile errors.

Fixed compile issues caused by webserver being split to a separate project.
WebServer now starts and stops correctly as a separate module.

node/src/integration-test/kotlin/net/corda/node/driver/DriverTests.kt

@@ -26,14 +26,6 @@ class DriverTests {
             // Check that the port is bound
             addressMustNotBeBound(executorService, hostAndPort)
         }
-
-        fun webserverMustBeUp(webserverAddr: HostAndPort) {
-            addressMustBeBound(executorService, webserverAddr)
-        }
-
-        fun webserverMustBeDown(webserverAddr: HostAndPort) {
-            addressMustNotBeBound(executorService, webserverAddr)
-        }
     }
 
     @Test
@@ -69,15 +61,4 @@ class DriverTests {
         }
         nodeMustBeDown(nodeInfo.nodeInfo)
     }
-
-    @Test
-    fun `starting a node and independent web server works`() {
-        val addr = driver {
-            val node = startNode("test").getOrThrow()
-            val webserverAddr = startWebserver(node).getOrThrow()
-            webserverMustBeUp(webserverAddr)
-            webserverAddr
-        }
-        webserverMustBeDown(addr)
-    }
 }

node/src/main/kotlin/net/corda/node/ArgsParser.kt

@@ -28,7 +28,6 @@ class ArgsParser {
             .withValuesConvertedBy(object : EnumConverter<Level>(Level::class.java) {})
             .defaultsTo(Level.INFO)
     private val logToConsoleArg = optionParser.accepts("log-to-console", "If set, prints logging to the console as well as to a file.")
-    private val isWebserverArg = optionParser.accepts("webserver")
     private val isRegistrationArg = optionParser.accepts("initial-registration", "Start initial node registration with Corda network to obtain certificate from the permissioning server.")
     private val helpArg = optionParser.accepts("help").forHelp()
 
@@ -42,9 +41,8 @@ class ArgsParser {
         val help = optionSet.has(helpArg)
         val loggingLevel = optionSet.valueOf(loggerLevel)
         val logToConsole = optionSet.has(logToConsoleArg)
-        val isWebserver = optionSet.has(isWebserverArg)
         val isRegistration = optionSet.has(isRegistrationArg)
-        return CmdLineOptions(baseDirectory, configFile, help, loggingLevel, logToConsole, isWebserver, isRegistration)
+        return CmdLineOptions(baseDirectory, configFile, help, loggingLevel, logToConsole, isRegistration)
     }
 
     fun printHelp(sink: PrintStream) = optionParser.printHelpOn(sink)
@@ -55,9 +53,8 @@ data class CmdLineOptions(val baseDirectory: Path,
                           val help: Boolean,
                           val loggingLevel: Level,
                           val logToConsole: Boolean,
-                          val isWebserver: Boolean,
                           val isRegistration: Boolean) {
     fun loadConfig(allowMissingConfig: Boolean = false, configOverrides: Map<String, Any?> = emptyMap()): Config {
         return ConfigHelper.loadConfig(baseDirectory, configFile, allowMissingConfig, configOverrides)
     }
-}
+}

node/src/main/kotlin/net/corda/node/Corda.kt

@@ -10,7 +10,6 @@ import net.corda.node.services.config.FullNodeConfiguration
 import net.corda.node.utilities.ANSIProgressObserver
 import net.corda.node.utilities.registration.HTTPNetworkRegistrationService
 import net.corda.node.utilities.registration.NetworkRegistrationHelper
-import net.corda.node.webserver.WebServer
 import org.fusesource.jansi.Ansi
 import org.fusesource.jansi.AnsiConsole
 import org.slf4j.LoggerFactory
@@ -61,8 +60,7 @@ fun main(args: Array<String>) {
 
     drawBanner()
 
-    val logDir = if (cmdlineOptions.isWebserver) "logs/web" else "logs"
-    System.setProperty("log-path", (cmdlineOptions.baseDirectory / logDir).toString())
+    System.setProperty("log-path", (cmdlineOptions.baseDirectory / "logs").toString())
 
     val log = LoggerFactory.getLogger("Main")
     printBasicNodeInfo("Logs can be found in", System.getProperty("log-path"))
@@ -94,39 +92,26 @@ fun main(args: Array<String>) {
     log.info("VM ${info.vmName} ${info.vmVendor} ${info.vmVersion}")
     log.info("Machine: ${InetAddress.getLocalHost().hostName}")
     log.info("Working Directory: ${cmdlineOptions.baseDirectory}")
-    if (cmdlineOptions.isWebserver) {
-        log.info("Starting as webserver on ${conf.webAddress}")
-    } else {
-        log.info("Starting as node on ${conf.artemisAddress}")
-    }
+    log.info("Starting as node on ${conf.artemisAddress}")
 
     try {
         cmdlineOptions.baseDirectory.createDirectories()
 
-        // TODO: Webserver should be split and start from inside a WAR container
-        if (!cmdlineOptions.isWebserver) {
-            val node = conf.createNode()
-            node.start()
-            printPluginsAndServices(node)
+        val node = conf.createNode()
+        node.start()
+        printPluginsAndServices(node)
 
-            node.networkMapRegistrationFuture.success {
-                val elapsed = (System.currentTimeMillis() - startTime) / 10 / 100.0
-                printBasicNodeInfo("Node started up and registered in $elapsed sec")
-
-                if (renderBasicInfoToConsole)
-                    ANSIProgressObserver(node.smm)
-            } failure {
-                log.error("Error during network map registration", it)
-                exitProcess(1)
-            }
-            node.run()
-        } else {
-            val server = WebServer(conf)
-            server.start()
+        node.networkMapRegistrationFuture.success {
             val elapsed = (System.currentTimeMillis() - startTime) / 10 / 100.0
-            printBasicNodeInfo("Webserver started up in $elapsed sec")
-            server.run()
+            printBasicNodeInfo("Node started up and registered in $elapsed sec")
+
+            if (renderBasicInfoToConsole)
+                ANSIProgressObserver(node.smm)
+        } failure {
+            log.error("Error during network map registration", it)
+            exitProcess(1)
         }
+        node.run()
     } catch (e: Exception) {
         log.error("Exception during node startup", e)
         exitProcess(1)

node/src/main/kotlin/net/corda/node/driver/Driver.kt

@@ -420,7 +420,7 @@ open class DriverDSL(
         }
     }
 
-    private fun queryWebserver(configuration: FullNodeConfiguration): HostAndPort? {
+    private fun queryWebserver(configuration: FullNodeConfiguration, process: Process): HostAndPort? {
         val protocol = if (configuration.useHTTPS) {
             "https://"
         } else {
@@ -429,7 +429,7 @@ open class DriverDSL(
         val url = URL(protocol + configuration.webAddress.toString() + "/api/status")
         val client = OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS).readTimeout(60, TimeUnit.SECONDS).build()
 
-        while (true) try {
+        while (process.isAlive) try {
             val response = client.newCall(Request.Builder().url(url).build()).execute()
             if (response.isSuccessful && (response.body().string() == "started")) {
                 return configuration.webAddress
@@ -437,14 +437,17 @@ open class DriverDSL(
         } catch(e: ConnectException) {
             log.debug("Retrying webserver info at ${configuration.webAddress}")
         }
+
+        log.error("Webserver at ${configuration.webAddress} has died")
+        return null
     }
 
     override fun startWebserver(handle: NodeHandle): ListenableFuture<HostAndPort> {
         val debugPort = if (isDebug) debugPortAllocation.nextPort() else null
-
-        return future {
-            registerProcess(DriverDSL.startWebserver(executorService, handle.configuration, debugPort))
-            queryWebserver(handle.configuration)!!
+        val process = DriverDSL.startWebserver(executorService, handle.configuration, debugPort)
+        registerProcess(process)
+        return process.map {
+            queryWebserver(handle.configuration, it)!!
         }
     }
 
@@ -542,7 +545,7 @@ open class DriverDSL(
                 executorService: ScheduledExecutorService,
                 nodeConf: FullNodeConfiguration,
                 debugPort: Int?): ListenableFuture<Process> {
-            val className = "net.corda.node.Corda" // cannot directly get class for this, so just use string
+            val className = "net.corda.webserver.WebServer" // cannot directly get class for this, so just use string
             val separator = System.getProperty("file.separator")
             val classpath = System.getProperty("java.class.path")
             val path = System.getProperty("java.home") + separator + "bin" + separator + "java"
@@ -556,8 +559,7 @@ open class DriverDSL(
                     listOf("-Dname=node-${nodeConf.artemisAddress}-webserver") + debugPortArg +
                     listOf(
                             "-cp", classpath, className,
-                            "--base-directory", nodeConf.baseDirectory.toString(),
-                            "--webserver")
+                            "--base-directory", nodeConf.baseDirectory.toString())
             val builder = ProcessBuilder(javaArgs)
             builder.redirectError(Paths.get("error.$className.log").toFile())
             builder.inheritIO()

node/src/main/kotlin/net/corda/node/internal/Node.kt

@@ -33,7 +33,6 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.time.Clock
 import javax.management.ObjectName
-import javax.servlet.*
 import kotlin.concurrent.thread
 
 /**
@@ -288,18 +287,6 @@ class Node(override val configuration: FullNodeConfiguration,
         f.setLength(0)
         f.write(ourProcessID.toByteArray())
     }
-
-    // Servlet filter to wrap API requests with a database transaction.
-    private class DatabaseTransactionFilter(val database: Database) : Filter {
-        override fun doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) {
-            databaseTransaction(database) {
-                chain.doFilter(request, response)
-            }
-        }
-
-        override fun init(filterConfig: FilterConfig?) {}
-        override fun destroy() {}
-    }
 }
 
 class ConfigurationException(message: String) : Exception(message)

node/src/main/kotlin/net/corda/node/utilities/JsonSupport.kt

@@ -1,252 +0,0 @@
-package net.corda.node.utilities
-
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.core.JsonParseException
-import com.fasterxml.jackson.core.JsonParser
-import com.fasterxml.jackson.core.JsonToken
-import com.fasterxml.jackson.databind.*
-import com.fasterxml.jackson.databind.deser.std.NumberDeserializers
-import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer
-import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.module.kotlin.KotlinModule
-import net.corda.core.contracts.BusinessCalendar
-import net.corda.core.crypto.*
-import net.corda.core.messaging.CordaRPCOps
-import net.corda.core.node.NodeInfo
-import net.corda.core.serialization.deserialize
-import net.corda.core.serialization.serialize
-import net.i2p.crypto.eddsa.EdDSAPublicKey
-import net.corda.core.node.services.IdentityService
-import java.math.BigDecimal
-import java.time.LocalDate
-import java.time.LocalDateTime
-
-/**
- * Utilities and serialisers for working with JSON representations of basic types. This adds Jackson support for
- * the java.time API, some core types, and Kotlin data classes.
- *
- * TODO: This does not belong in node. It should be moved to the client module or a dedicated webserver module.
- */
-object JsonSupport {
-    interface PartyObjectMapper {
-        fun partyFromName(partyName: String): Party?
-        fun partyFromKey(owningKey: CompositeKey): Party?
-    }
-
-    class RpcObjectMapper(val rpc: CordaRPCOps) : PartyObjectMapper, ObjectMapper() {
-        override fun partyFromName(partyName: String): Party? = rpc.partyFromName(partyName)
-        override fun partyFromKey(owningKey: CompositeKey): Party? = rpc.partyFromKey(owningKey)
-    }
-    class IdentityObjectMapper(val identityService: IdentityService) : PartyObjectMapper, ObjectMapper(){
-        override fun partyFromName(partyName: String): Party? = identityService.partyFromName(partyName)
-        override fun partyFromKey(owningKey: CompositeKey): Party? = identityService.partyFromKey(owningKey)
-    }
-    class NoPartyObjectMapper: PartyObjectMapper, ObjectMapper() {
-        override fun partyFromName(partyName: String): Party? = throw UnsupportedOperationException()
-        override fun partyFromKey(owningKey: CompositeKey): Party? = throw UnsupportedOperationException()
-    }
-
-    val javaTimeModule: Module by lazy {
-        SimpleModule("java.time").apply {
-            addSerializer(LocalDate::class.java, ToStringSerializer)
-            addDeserializer(LocalDate::class.java, LocalDateDeserializer)
-            addKeyDeserializer(LocalDate::class.java, LocalDateKeyDeserializer)
-            addSerializer(LocalDateTime::class.java, ToStringSerializer)
-        }
-    }
-
-    val cordaModule: Module by lazy {
-        SimpleModule("core").apply {
-            addSerializer(AnonymousParty::class.java, AnonymousPartySerializer)
-            addDeserializer(AnonymousParty::class.java, AnonymousPartyDeserializer)
-            addSerializer(Party::class.java, PartySerializer)
-            addDeserializer(Party::class.java, PartyDeserializer)
-            addSerializer(BigDecimal::class.java, ToStringSerializer)
-            addDeserializer(BigDecimal::class.java, NumberDeserializers.BigDecimalDeserializer())
-            addSerializer(SecureHash::class.java, SecureHashSerializer)
-            // It's slightly remarkable, but apparently Jackson works out that this is the only possibility
-            // for a SecureHash at the moment and tries to use SHA256 directly even though we only give it SecureHash
-            addDeserializer(SecureHash.SHA256::class.java, SecureHashDeserializer())
-            addDeserializer(BusinessCalendar::class.java, CalendarDeserializer)
-
-            // For ed25519 pubkeys
-            addSerializer(EdDSAPublicKey::class.java, PublicKeySerializer)
-            addDeserializer(EdDSAPublicKey::class.java, PublicKeyDeserializer)
-
-            // For composite keys
-            addSerializer(CompositeKey::class.java, CompositeKeySerializer)
-            addDeserializer(CompositeKey::class.java, CompositeKeyDeserializer)
-
-            // For NodeInfo
-            // TODO this tunnels the Kryo representation as a Base58 encoded string. Replace when RPC supports this.
-            addSerializer(NodeInfo::class.java, NodeInfoSerializer)
-            addDeserializer(NodeInfo::class.java, NodeInfoDeserializer)
-        }
-    }
-
-    /* Mapper requiring RPC support to deserialise parties from names */
-    fun createDefaultMapper(rpc: CordaRPCOps): ObjectMapper = configureMapper(RpcObjectMapper(rpc))
-
-    /* For testing or situations where deserialising parties is not required */
-    fun createNonRpcMapper(): ObjectMapper = configureMapper(NoPartyObjectMapper())
-
-    /* For testing with an in memory identity service */
-    fun createInMemoryMapper(identityService: IdentityService) = configureMapper(IdentityObjectMapper(identityService))
-
-    private fun configureMapper(mapper: ObjectMapper): ObjectMapper = mapper.apply {
-        enable(SerializationFeature.INDENT_OUTPUT)
-        enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-        enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-
-        registerModule(javaTimeModule)
-        registerModule(cordaModule)
-        registerModule(KotlinModule())
-    }
-
-    object ToStringSerializer : JsonSerializer<Any>() {
-        override fun serialize(obj: Any, generator: JsonGenerator, provider: SerializerProvider) {
-            generator.writeString(obj.toString())
-        }
-    }
-
-    object LocalDateDeserializer : JsonDeserializer<LocalDate>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): LocalDate {
-            return try {
-                LocalDate.parse(parser.text)
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid LocalDate ${parser.text}: ${e.message}")
-            }
-        }
-    }
-
-    object LocalDateKeyDeserializer : KeyDeserializer() {
-        override fun deserializeKey(text: String, p1: DeserializationContext): Any? {
-            return LocalDate.parse(text)
-        }
-
-    }
-
-    object AnonymousPartySerializer : JsonSerializer<AnonymousParty>() {
-        override fun serialize(obj: AnonymousParty, generator: JsonGenerator, provider: SerializerProvider) {
-            generator.writeString(obj.owningKey.toBase58String())
-        }
-    }
-
-    object AnonymousPartyDeserializer : JsonDeserializer<AnonymousParty>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): AnonymousParty {
-            if (parser.currentToken == JsonToken.FIELD_NAME) {
-                parser.nextToken()
-            }
-
-            val mapper = parser.codec as PartyObjectMapper
-            // TODO this needs to use some industry identifier(s) instead of these keys
-            val key = CompositeKey.parseFromBase58(parser.text)
-            val party = mapper.partyFromKey(key) ?: throw JsonParseException(parser, "Could not find a Party with key ${parser.text}")
-            return party.toAnonymous()
-        }
-    }
-
-    object PartySerializer : JsonSerializer<Party>() {
-        override fun serialize(obj: Party, generator: JsonGenerator, provider: SerializerProvider) {
-            generator.writeString(obj.name)
-        }
-    }
-
-    object PartyDeserializer : JsonDeserializer<Party>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): Party {
-            if (parser.currentToken == JsonToken.FIELD_NAME) {
-                parser.nextToken()
-            }
-
-            val mapper = parser.codec as PartyObjectMapper
-            // TODO this needs to use some industry identifier(s) not just these human readable names
-            return mapper.partyFromName(parser.text) ?: throw JsonParseException(parser, "Could not find a Party with name ${parser.text}")
-        }
-    }
-
-    object NodeInfoSerializer : JsonSerializer<NodeInfo>() {
-        override fun serialize(value: NodeInfo, gen: JsonGenerator, serializers: SerializerProvider) {
-            gen.writeString(Base58.encode(value.serialize().bytes))
-        }
-    }
-
-    object NodeInfoDeserializer : JsonDeserializer<NodeInfo>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): NodeInfo {
-            if (parser.currentToken == JsonToken.FIELD_NAME) {
-                parser.nextToken()
-            }
-            try {
-                return Base58.decode(parser.text).deserialize<NodeInfo>()
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid NodeInfo ${parser.text}: ${e.message}")
-            }
-        }
-    }
-
-    object SecureHashSerializer : JsonSerializer<SecureHash>() {
-        override fun serialize(obj: SecureHash, generator: JsonGenerator, provider: SerializerProvider) {
-            generator.writeString(obj.toString())
-        }
-    }
-
-    /**
-     * Implemented as a class so that we can instantiate for T.
-     */
-    class SecureHashDeserializer<T : SecureHash> : JsonDeserializer<T>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): T {
-            if (parser.currentToken == JsonToken.FIELD_NAME) {
-                parser.nextToken()
-            }
-            try {
-                @Suppress("UNCHECKED_CAST")
-                return SecureHash.parse(parser.text) as T
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid hash ${parser.text}: ${e.message}")
-            }
-        }
-    }
-
-    object CalendarDeserializer : JsonDeserializer<BusinessCalendar>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): BusinessCalendar {
-            return try {
-                val array = StringArrayDeserializer.instance.deserialize(parser, context)
-                BusinessCalendar.getInstance(*array)
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid calendar(s) ${parser.text}: ${e.message}")
-            }
-        }
-    }
-
-    object PublicKeySerializer : JsonSerializer<EdDSAPublicKey>() {
-        override fun serialize(obj: EdDSAPublicKey, generator: JsonGenerator, provider: SerializerProvider) {
-            check(obj.params == ed25519Curve)
-            generator.writeString(obj.toBase58String())
-        }
-    }
-
-    object PublicKeyDeserializer : JsonDeserializer<EdDSAPublicKey>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): EdDSAPublicKey {
-            return try {
-                parsePublicKeyBase58(parser.text)
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid public key ${parser.text}: ${e.message}")
-            }
-        }
-    }
-
-    object CompositeKeySerializer : JsonSerializer<CompositeKey>() {
-        override fun serialize(obj: CompositeKey, generator: JsonGenerator, provider: SerializerProvider) {
-            generator.writeString(obj.toBase58String())
-        }
-    }
-
-    object CompositeKeyDeserializer : JsonDeserializer<CompositeKey>() {
-        override fun deserialize(parser: JsonParser, context: DeserializationContext): CompositeKey {
-            return try {
-                CompositeKey.parseFromBase58(parser.text)
-            } catch (e: Exception) {
-                throw JsonParseException(parser, "Invalid composite key ${parser.text}: ${e.message}")
-            }
-        }
-    }
-}

node/src/test/kotlin/net/corda/node/ArgsParserTest.kt

@@ -5,7 +5,6 @@ import net.corda.core.div
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.Test
-import org.slf4j.event.Level
 import java.nio.file.Paths
 
 class ArgsParserTest {
@@ -20,7 +19,6 @@ class ArgsParserTest {
                 help = false,
                 logToConsole = false,
                 loggingLevel = Level.INFO,
-                isWebserver = false,
                 isRegistration = false))
     }
 
@@ -69,12 +67,6 @@ class ArgsParserTest {
         }
     }
 
-    @Test
-    fun `webserver`() {
-        val cmdLineOptions = parser.parse("--webserver")
-        assertThat(cmdLineOptions.isWebserver).isTrue()
-    }
-
     @Test
     fun `both base-directory and config-file`() {
         assertThatExceptionOfType(IllegalArgumentException::class.java).isThrownBy {
@@ -109,4 +101,4 @@ class ArgsParserTest {
             parser.parse("--logging-level", "not-a-level")
         }.withMessageContaining("logging-level")
     }
-}
+}

node/src/test/kotlin/net/corda/node/JsonSupportTest.kt

@@ -1,27 +0,0 @@
-package net.corda.node
-
-import com.pholser.junit.quickcheck.From
-import com.pholser.junit.quickcheck.Property
-import com.pholser.junit.quickcheck.runner.JUnitQuickcheck
-import net.corda.core.testing.PublicKeyGenerator
-import net.corda.node.utilities.JsonSupport
-import net.corda.testing.node.MockIdentityService
-import net.i2p.crypto.eddsa.EdDSAPublicKey
-import org.junit.runner.RunWith
-import java.security.PublicKey
-import kotlin.test.assertEquals
-
-@RunWith(JUnitQuickcheck::class)
-class JsonSupportTest {
-
-    companion object {
-        val mapper = JsonSupport.createNonRpcMapper()
-    }
-
-    @Property
-    fun publicKeySerializingWorks(@From(PublicKeyGenerator::class) publicKey: PublicKey) {
-        val serialized = mapper.writeValueAsString(publicKey)
-        val parsedKey = mapper.readValue(serialized, EdDSAPublicKey::class.java)
-        assertEquals(publicKey, parsedKey)
-    }
-}