More merge fixes and moved NodesInfoFilesCopier into internal package

constants.properties

@@ -1,4 +1,4 @@
-gradlePluginsVersion=3.0.0-NETWORKMAP
+gradlePluginsVersion=3.0.1-NETWORKMAP
 kotlinVersion=1.1.60
 platformVersion=2
 guavaVersion=21.0

gradle-plugins/cordform-common/src/main/java/net/corda/cordform/NetworkParametersGenerator.java

@@ -2,7 +2,6 @@ package net.corda.cordform;
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 
 public interface NetworkParametersGenerator {
     /**

gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt

@@ -10,6 +10,7 @@ import org.gradle.api.GradleException
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME
 import org.gradle.api.tasks.TaskAction
+import java.io.File
 import java.net.URLClassLoader
 import java.nio.file.Path
 import java.nio.file.Paths

gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt

@@ -1,9 +1,9 @@
 package net.corda.plugins
 
-import com.typesafe.config.*
+import com.typesafe.config.ConfigFactory
+import com.typesafe.config.ConfigRenderOptions
+import com.typesafe.config.ConfigValueFactory
 import net.corda.cordform.CordformNode
-import org.bouncycastle.asn1.x500.X500Name
-import org.bouncycastle.asn1.x500.style.BCStyle
 import org.gradle.api.Project
 import java.io.File
 import java.nio.charset.StandardCharsets

node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeInfoFilesCopier.kt

@@ -1,4 +1,4 @@
-package net.corda.nodeapi
+package net.corda.nodeapi.internal
 
 import net.corda.cordform.CordformNode
 import net.corda.core.internal.ThreadBox

node-api/src/main/kotlin/net/corda/nodeapi/internal/TestNetworkParametersGenerator.kt

@@ -75,7 +75,9 @@ class TestNetworkParametersGenerator : NetworkParametersGenerator {
      * @return list of latest [NodeInfo]s
      */
     private fun getAllNodeInfos(nodesDirs: List<Path>): List<NodeInfo> {
-        val nodeInfoFiles = nodesDirs.map { dir -> dir.list { it.filter { "nodeInfo-" in it.toString() }.toList()[0] } } // We take the first one only
+        val nodeInfoFiles = nodesDirs.map { dir ->
+            dir.list { it.filter { "nodeInfo-" in it.toString() }.findFirst().get() }
+        }
         return nodeInfoFiles.mapNotNull { processFile(it) }
     }
 

node-api/src/test/kotlin/net/corda/nodeapi/NodeInfoFilesCopierTest.kt

@@ -1,6 +1,7 @@
 package net.corda.nodeapi
 
 import net.corda.cordform.CordformNode
+import net.corda.nodeapi.internal.NodeInfoFilesCopier
 import net.corda.testing.eventually
 import org.junit.Before
 import org.junit.Rule

node/src/integration-test/kotlin/net/corda/node/services/network/NodeInfoWatcherTest.kt

@@ -10,7 +10,7 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.KeyManagementService
 import net.corda.core.serialization.serialize
 import net.corda.node.services.identity.InMemoryIdentityService
-import net.corda.nodeapi.NodeInfoFilesCopier
+import net.corda.nodeapi.internal.NodeInfoFilesCopier
 import net.corda.testing.*
 import net.corda.testing.node.MockKeyManagementService
 import org.assertj.core.api.Assertions.assertThat

node/src/main/kotlin/net/corda/node/services/network/NodeInfoWatcher.kt

@@ -9,7 +9,7 @@ import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import net.corda.core.utilities.contextLogger
 import net.corda.core.utilities.seconds
-import net.corda.nodeapi.NodeInfoFilesCopier
+import net.corda.nodeapi.internal.NodeInfoFilesCopier
 import rx.Observable
 import rx.Scheduler
 import rx.schedulers.Schedulers

testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt

@@ -35,7 +35,7 @@ import net.corda.node.services.transactions.RaftValidatingNotaryService
 import net.corda.node.utilities.ServiceIdentityGenerator
 import net.corda.node.utilities.registration.HTTPNetworkRegistrationService
 import net.corda.node.utilities.registration.NetworkRegistrationHelper
-import net.corda.nodeapi.NodeInfoFilesCopier
+import net.corda.nodeapi.internal.NodeInfoFilesCopier
 import net.corda.nodeapi.User
 import net.corda.nodeapi.config.parseAs
 import net.corda.nodeapi.config.toConfig

tools/demobench/src/main/kotlin/net/corda/demobench/model/DemoBenchNodeInfoFilesCopier.kt

@@ -1,6 +1,6 @@
 package net.corda.demobench.model
 
-import net.corda.nodeapi.NodeInfoFilesCopier
+import net.corda.nodeapi.internal.NodeInfoFilesCopier
 import rx.Scheduler
 import rx.schedulers.Schedulers
 import tornadofx.*