From 035656bd89c7b834daec67b0683ccd2a6cfd25ac Mon Sep 17 00:00:00 2001 From: Viktor Kolomeyko Date: Tue, 20 Nov 2018 17:15:48 +0000 Subject: [PATCH] ENT-2653: Introducing CommonCliConstants (#4265) --- node/src/main/kotlin/net/corda/node/NodeCmdLineOptions.kt | 3 ++- .../test/kotlin/net/corda/node/internal/NodeStartupTest.kt | 5 ++--- .../kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/NodeCmdLineOptions.kt b/node/src/main/kotlin/net/corda/node/NodeCmdLineOptions.kt index 37293ddf51..5a9a0788ae 100644 --- a/node/src/main/kotlin/net/corda/node/NodeCmdLineOptions.kt +++ b/node/src/main/kotlin/net/corda/node/NodeCmdLineOptions.kt @@ -3,6 +3,7 @@ package net.corda.node import com.typesafe.config.Config import com.typesafe.config.ConfigException import com.typesafe.config.ConfigFactory +import net.corda.cliutils.CommonCliConstants.BASE_DIR import net.corda.common.configuration.parsing.internal.Configuration import net.corda.common.validation.internal.Validated import net.corda.common.validation.internal.Validated.Companion.invalid @@ -23,7 +24,7 @@ open class SharedNodeCmdLineOptions { private val logger by lazy { loggerFor() } } @Option( - names = ["-b", "--base-directory"], + names = ["-b", BASE_DIR], description = ["The node working directory where all the files are kept."] ) var baseDirectory: Path = Paths.get(".").toAbsolutePath().normalize() diff --git a/node/src/test/kotlin/net/corda/node/internal/NodeStartupTest.kt b/node/src/test/kotlin/net/corda/node/internal/NodeStartupTest.kt index 976c1fec79..e49e36d6a2 100644 --- a/node/src/test/kotlin/net/corda/node/internal/NodeStartupTest.kt +++ b/node/src/test/kotlin/net/corda/node/internal/NodeStartupTest.kt @@ -1,8 +1,7 @@ package net.corda.node.internal +import net.corda.cliutils.CommonCliConstants.BASE_DIR import net.corda.core.internal.div -import net.corda.node.InitialRegistrationCmdLineOptions -import net.corda.node.internal.subcommands.InitialRegistrationCli import net.corda.nodeapi.internal.config.UnknownConfigKeysPolicy import org.assertj.core.api.Assertions.assertThat import org.junit.BeforeClass @@ -44,7 +43,7 @@ class NodeStartupTest { @Test fun `--base-directory`() { - CommandLine.populateCommand(startup, "--base-directory", (workingDirectory / "another-base-dir").toString()) + CommandLine.populateCommand(startup, BASE_DIR, (workingDirectory / "another-base-dir").toString()) assertThat(startup.cmdLineOptions.baseDirectory).isEqualTo(workingDirectory / "another-base-dir") assertThat(startup.cmdLineOptions.configFile).isEqualTo(workingDirectory / "another-base-dir" / "node.conf") assertThat(startup.cmdLineOptions.networkRootTrustStorePathParameter).isEqualTo(null) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt index 87c36dd2a6..98333f36d4 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt @@ -6,6 +6,7 @@ import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigRenderOptions import com.typesafe.config.ConfigValueFactory import net.corda.client.rpc.internal.createCordaRPCClientWithSslAndClassLoader +import net.corda.cliutils.CommonCliConstants.BASE_DIR import net.corda.core.concurrent.CordaFuture import net.corda.core.concurrent.firstOf import net.corda.core.flows.FlowLogic @@ -889,7 +890,7 @@ class DriverDSLImpl( writeConfig(handle.baseDirectory, "web-server.conf", handle.toWebServerConfig()) return ProcessUtilities.startJavaProcess( className = className, // cannot directly get class for this, so just use string - arguments = listOf("--base-directory", handle.baseDirectory.toString()), + arguments = listOf(BASE_DIR, handle.baseDirectory.toString()), jdwpPort = debugPort, extraJvmArguments = listOf("-Dname=node-${handle.p2pAddress}-webserver") + inheritFromParentProcess().map { "-D${it.first}=${it.second}" },