diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt index 4ef9eb1753..7ead07dfbe 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/Explorer.kt @@ -5,10 +5,9 @@ import java.util.concurrent.Executors import kotlin.reflect.jvm.jvmName -class Explorer(explorerController: ExplorerController) : AutoCloseable { +class Explorer(val explorerController: ExplorerController) : AutoCloseable { private val log = LoggerFactory.getLogger(Explorer::class.jvmName) - private val explorerController: ExplorerController = explorerController private val executor = Executors.newSingleThreadExecutor() private var process: Process? = null diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/NetworkMapConfig.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/NetworkMapConfig.kt index 24543a9edc..f91e35177e 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/model/NetworkMapConfig.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/NetworkMapConfig.kt @@ -1,19 +1,11 @@ package net.corda.demobench.model -open class NetworkMapConfig(legalName: String, artemisPort: Int) { +open class NetworkMapConfig(val legalName: String, val artemisPort: Int) { - private var keyValue: String = toKey(legalName) + private var keyValue = toKey(legalName) val key : String get() { return keyValue } - private var legalNameValue: String = legalName - val legalName : String - get() { return legalNameValue } - - private var artemisPortValue: Int = artemisPort - val artemisPort : Int - get() { return artemisPortValue } - } private val WHITESPACE = "\\s++".toRegex() diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt index 5044db0d89..5ed71ce13b 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt @@ -9,28 +9,12 @@ import java.lang.String.join class NodeConfig( legalName: String, artemisPort: Int, - nearestCity: String, - webPort: Int, - h2Port: Int, - extraServices: List + val nearestCity: String, + val webPort: Int, + val h2Port: Int, + val extraServices: List ) : NetworkMapConfig(legalName, artemisPort) { - private var nearestCityName: String = nearestCity - val nearestCity : String - get() { return nearestCityName } - - private var webPortValue: Int = webPort - val webPort : Int - get() { return webPortValue } - - private var h2PortValue: Int = h2Port - val h2Port : Int - get() { return h2PortValue } - - private var extraServicesValue: List = extraServices - val extraServices : List - get() { return extraServicesValue } - private var networkMapValue: NetworkMapConfig? = null var networkMap : NetworkMapConfig? get() { return networkMapValue }