From 9239050fc88aeb9e8f649317f671039bdac5afc1 Mon Sep 17 00:00:00 2001 From: Andrzej Cichocki Date: Thu, 5 Oct 2017 15:38:25 +0100 Subject: [PATCH] Make cordapp-example java tree buildable (#1809) --- .../src/main/kotlin/net/corda/testing/driver/Driver.kt | 7 +++++-- .../src/main/kotlin/net/corda/testing/node/MockNode.kt | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt index 15fd43b655..8f62fa88c3 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt @@ -133,12 +133,15 @@ interface DriverDSLExposedInterface : CordformContext { rpcUsers: List = emptyList(), startInSameProcess: Boolean? = null): CordaFuture>> + /** Call [startWebserver] with a default maximumHeapSize. */ + fun startWebserver(handle: NodeHandle): CordaFuture = startWebserver(handle, "200m") + /** * Starts a web server for a node - * * @param handle The handle for the node that this webserver connects to via RPC. + * @param maximumHeapSize Argument for JVM -Xmx option e.g. "200m". */ - fun startWebserver(handle: NodeHandle, maximumHeapSize: String = "200m"): CordaFuture + fun startWebserver(handle: NodeHandle, maximumHeapSize: String): CordaFuture /** * Starts a network map service node. Note that only a single one should ever be running, so you will probably want diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt index 92a40391b5..af479b9382 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt @@ -404,10 +404,7 @@ class MockNetwork(private val networkSendManuallyPumped: Boolean = false, advertisedServices = *arrayOf(ServiceInfo(ValidatingNotaryService.type, serviceName))) } - // Convenience method for Java - fun createPartyNode(networkMapAddress: SingleMessageRecipient, - legalName: CordaX500Name) = createPartyNode(networkMapAddress, legalName, null) - + @JvmOverloads fun createPartyNode(networkMapAddress: SingleMessageRecipient, legalName: CordaX500Name? = null, overrideServices: Map? = null): StartedNode {