docs: Address PR 513 comments

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

@@ -120,7 +120,7 @@ class Node(override val configuration: FullNodeConfiguration, networkMapAddress:
     override fun makeMessagingService(): MessagingServiceInternal {
         val legalIdentity = obtainLegalIdentity()
         val myIdentityOrNullIfNetworkMapService = if (networkMapService != null) legalIdentity.owningKey else null
-        userService = RPCUserServiceImpl(configuration.config)
+        userService = RPCUserServiceImpl(configuration)
         val serverAddr = with(configuration) {
             messagingServerAddress ?: {
                 messageBroker = ArtemisMessagingServer(this, artemisAddress, myIdentityOrNullIfNetworkMapService, services.networkMapCache, userService)

node/src/main/kotlin/net/corda/node/services/RPCUserService.kt

@@ -1,8 +1,7 @@
 package net.corda.node.services
 
-import com.typesafe.config.Config
 import net.corda.core.flows.FlowLogic
-import net.corda.node.services.config.getListOrElse
+import net.corda.node.services.config.FullNodeConfiguration
 
 /**
  * Service for retrieving [User] objects representing RPC users who are authorised to use the RPC system. A [User]
@@ -16,21 +15,9 @@ interface RPCUserService {
 
 // TODO Store passwords as salted hashes
 // TODO Or ditch this and consider something like Apache Shiro
-class RPCUserServiceImpl(config: Config) : RPCUserService {
+class RPCUserServiceImpl(config: FullNodeConfiguration) : RPCUserService {
 
-    private val _users: Map<String, User>
-
-    init {
-        _users = config.getListOrElse<Config>("rpcUsers") { emptyList() }
-                .map {
-                    val username = it.getString("user")
-                    require(username.matches("\\w+".toRegex())) { "Username $username contains invalid characters" }
-                    val password = it.getString("password")
-                    val permissions = it.getListOrElse<String>("permissions") { emptyList() }.toSet()
-                    User(username, password, permissions)
-                }
-                .associateBy(User::username)
-    }
+    private val _users = config.rpcUsers.associateBy(User::username)
 
     override fun getUser(username: String): User? = _users[username]
 

node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt

@@ -7,6 +7,7 @@ import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.node.services.ServiceInfo
 import net.corda.node.internal.Node
 import net.corda.node.serialization.NodeClock
+import net.corda.node.services.User
 import net.corda.node.services.messaging.NodeMessagingClient
 import net.corda.node.services.network.NetworkMapService
 import net.corda.node.utilities.TestClock
@@ -51,6 +52,15 @@ class FullNodeConfiguration(val config: Config) : NodeConfiguration {
     val useTestClock: Boolean by config.getOrElse { false }
     val notaryNodeAddress: HostAndPort? by config.getOrElse { null }
     val notaryClusterAddresses: List<HostAndPort> = config.getListOrElse<String>("notaryClusterAddresses") { emptyList<String>() }.map { HostAndPort.fromString(it) }
+    val rpcUsers: List<User> =
+            config.getListOrElse<Config>("rpcUsers") { emptyList() }
+            .map {
+                val username = it.getString("user")
+                require(username.matches("\\w+".toRegex())) { "Username $username contains invalid characters" }
+                val password = it.getString("password")
+                val permissions = it.getListOrElse<String>("permissions") { emptyList() }.toSet()
+                User(username, password, permissions)
+            }
 
     fun createNode(): Node {
         // This is a sanity feature do not remove.

node/src/test/kotlin/net/corda/node/services/ArtemisMessagingTests.kt

@@ -11,6 +11,7 @@ import net.corda.core.messaging.Message
 import net.corda.core.messaging.createMessage
 import net.corda.core.node.services.DEFAULT_SESSION_ID
 import net.corda.core.utilities.LogHelper
+import net.corda.node.services.config.FullNodeConfiguration
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.messaging.ArtemisMessagingServer
 import net.corda.node.services.messaging.NodeMessagingClient
@@ -65,7 +66,7 @@ class ArtemisMessagingTests {
 
     @Before
     fun setUp() {
-        userService = RPCUserServiceImpl(ConfigFactory.empty())
+        userService = RPCUserServiceImpl(FullNodeConfiguration(ConfigFactory.empty()))
         // TODO: create a base class that provides a default implementation
         config = object : NodeConfiguration {
             override val basedir: Path = temporaryFolder.newFolder().toPath()

node/src/test/kotlin/net/corda/node/services/RPCUserServiceImplTest.kt

@@ -1,6 +1,7 @@
 package net.corda.node.services
 
 import com.typesafe.config.ConfigFactory
+import net.corda.node.services.config.FullNodeConfiguration
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Test
@@ -68,6 +69,6 @@ class RPCUserServiceImplTest {
     }
 
     private fun loadWithContents(configString: String): RPCUserServiceImpl {
-        return RPCUserServiceImpl(ConfigFactory.parseString(configString))
+        return RPCUserServiceImpl(FullNodeConfiguration(ConfigFactory.parseString(configString)))
     }
 }