From 16465ba4754387330f6ab53000f9489053e237ed Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Mon, 13 Jun 2016 14:01:16 +0100 Subject: [PATCH] node: prefix private field with '_', use get() = --- .../main/kotlin/com/r3corda/node/internal/AbstractNode.kt | 7 ++++--- .../node/services/network/InMemoryMessagingNetwork.kt | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt index ceaf8f9650..5463e08575 100644 --- a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt @@ -113,8 +113,9 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, private set /** Completes once the node has successfully registered with the network map service */ - private val networkMapRegistrationSettableFuture: SettableFuture = SettableFuture.create() - val networkMapRegistrationFuture: ListenableFuture = networkMapRegistrationSettableFuture + private val _networkMapRegistrationSettableFuture: SettableFuture = SettableFuture.create() + val networkMapRegistrationFuture: ListenableFuture + get() = _networkMapRegistrationSettableFuture /** Set to true once [start] has been successfully called. */ @Volatile var started = false @@ -148,7 +149,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, CashBalanceAsMetricsObserver(services) startMessagingService() - networkMapRegistrationSettableFuture.setFuture(registerWithNetworkMap()) + _networkMapRegistrationSettableFuture.setFuture(registerWithNetworkMap()) isPreviousCheckpointsPresent = checkpointStorage.checkpoints.any() smm.start() started = true diff --git a/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt index f32d1d1a59..b4e2a4e6ad 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt @@ -81,7 +81,8 @@ class InMemoryMessagingNetwork() : SingletonSerializeAsToken() { private val _allMessages = PublishSubject.create() /** A stream of (sender, message, recipients) triples */ - val allMessages: Observable = _allMessages + val allMessages: Observable + get() = _allMessages interface LatencyCalculator { fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration