CORDA-1924: Remove references to Cordform definition and cordform-common (#3842)

node-api/build.gradle

@@ -22,8 +22,6 @@ dependencies {
     // TODO: Remove this dependency and the code that requires it
     compile "commons-fileupload:commons-fileupload:$fileupload_version"
 
-    compile "net.corda.plugins:cordform-common:$gradle_plugins_version"
-
     // TypeSafe Config: for simple and human friendly config files.
     compile "com.typesafe:config:$typesafe_config_version"
 

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

@@ -0,0 +1,4 @@
+package net.corda.nodeapi.internal
+
+// TODO: Add to Corda node.conf to allow customisation
+const val NODE_INFO_DIRECTORY = "additional-node-infos"

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

@@ -2,7 +2,6 @@ package net.corda.nodeapi.internal.network
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import net.corda.cordform.CordformNode
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.identity.Party
 import net.corda.core.internal.*
@@ -46,11 +45,11 @@ import kotlin.streams.toList
  */
 // TODO Move this to tools:bootstrapper
 class NetworkBootstrapper
-    @VisibleForTesting
-    internal constructor(private val initSerEnv: Boolean,
-                         private val embeddedCordaJar: () -> InputStream,
-                         private val nodeInfosGenerator: (List<Path>) -> List<Path>,
-                         private val contractsJarConverter: (Path) -> ContractsJar) {
+@VisibleForTesting
+internal constructor(private val initSerEnv: Boolean,
+                     private val embeddedCordaJar: () -> InputStream,
+                     private val nodeInfosGenerator: (List<Path>) -> List<Path>,
+                     private val contractsJarConverter: (Path) -> ContractsJar) {
 
     constructor() : this(
             initSerEnv = true,
@@ -102,7 +101,7 @@ class NetworkBootstrapper
                 process.destroyForcibly()
                 throw IllegalStateException("Error while generating node info file. Please check the logs in $logsDir.")
             }
-            check(process.exitValue() == 0) {  "Error while generating node info file. Please check the logs in $logsDir." }
+            check(process.exitValue() == 0) { "Error while generating node info file. Please check the logs in $logsDir." }
             return nodeDir.list { paths ->
                 paths.filter { it.fileName.toString().startsWith(NODE_INFO_FILE_NAME_PREFIX) }.findFirst().get()
             }
@@ -269,7 +268,7 @@ class NetworkBootstrapper
 
     private fun distributeNodeInfos(nodeDirs: List<Path>, nodeInfoFiles: List<Path>) {
         for (nodeDir in nodeDirs) {
-            val additionalNodeInfosDir = (nodeDir / CordformNode.NODE_INFO_DIRECTORY).createDirectories()
+            val additionalNodeInfosDir = (nodeDir / NODE_INFO_DIRECTORY).createDirectories()
             for (nodeInfoFile in nodeInfoFiles) {
                 nodeInfoFile.copyToDirectory(additionalNodeInfosDir, REPLACE_EXISTING)
             }
@@ -364,10 +363,10 @@ class NetworkBootstrapper
 
     private fun NodeInfo.notaryIdentity(): Party {
         return when (legalIdentities.size) {
-            // Single node notaries have just one identity like all other nodes. This identity is the notary identity
+        // Single node notaries have just one identity like all other nodes. This identity is the notary identity
             1 -> legalIdentities[0]
-            // Nodes which are part of a distributed notary have a second identity which is the composite identity of the
-            // cluster and is shared by all the other members. This is the notary identity.
+        // Nodes which are part of a distributed notary have a second identity which is the composite identity of the
+        // cluster and is shared by all the other members. This is the notary identity.
             2 -> legalIdentities[1]
             else -> throw IllegalArgumentException("Not sure how to get the notary identity in this scenerio: $this")
         }

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

@@ -1,8 +1,8 @@
 package net.corda.nodeapi.internal.network
 
-import net.corda.cordform.CordformNode
 import net.corda.core.internal.*
 import net.corda.core.utilities.contextLogger
+import net.corda.nodeapi.internal.NODE_INFO_DIRECTORY
 import rx.Observable
 import rx.Scheduler
 import rx.Subscription
@@ -96,10 +96,11 @@ class NodeInfoFilesCopier(scheduler: Scheduler = Schedulers.io()) : AutoCloseabl
     private fun poll() {
         nodeDataMapBox.locked {
             for (nodeData in values) {
-                nodeData.nodeDir.list { paths -> paths
-                        .filter { it.isRegularFile() }
-                        .filter { it.fileName.toString().startsWith(NODE_INFO_FILE_NAME_PREFIX) }
-                        .forEach { processPath(nodeData, it) }
+                nodeData.nodeDir.list { paths ->
+                    paths
+                            .filter { it.isRegularFile() }
+                            .filter { it.fileName.toString().startsWith(NODE_INFO_FILE_NAME_PREFIX) }
+                            .forEach { processPath(nodeData, it) }
                 }
             }
         }
@@ -149,7 +150,7 @@ class NodeInfoFilesCopier(scheduler: Scheduler = Schedulers.io()) : AutoCloseabl
      * Convenience holder for all the paths and files relative to a single node.
      */
     private class NodeData(val nodeDir: Path) {
-        val additionalNodeInfoDirectory: Path = nodeDir.resolve(CordformNode.NODE_INFO_DIRECTORY)
+        val additionalNodeInfoDirectory: Path = nodeDir.resolve(NODE_INFO_DIRECTORY)
         // Map from Path to its lastModifiedTime.
         val previouslySeenFiles = mutableMapOf<Path, FileTime>()
 

node-api/src/test/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapperTest.kt

@@ -1,7 +1,6 @@
 package net.corda.nodeapi.internal.network
 
 import com.typesafe.config.ConfigFactory
-import net.corda.cordform.CordformNode.NODE_INFO_DIRECTORY
 import net.corda.core.crypto.secureRandomBytes
 import net.corda.core.crypto.sha256
 import net.corda.core.identity.CordaX500Name
@@ -11,6 +10,7 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.serialization.serialize
 import net.corda.node.services.config.NotaryConfig
 import net.corda.nodeapi.internal.DEV_ROOT_CA
+import net.corda.nodeapi.internal.NODE_INFO_DIRECTORY
 import net.corda.nodeapi.internal.SignedNodeInfo
 import net.corda.nodeapi.internal.config.parseAs
 import net.corda.nodeapi.internal.config.toConfig

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

@@ -1,10 +1,10 @@
 package net.corda.nodeapi.internal.network
 
-import net.corda.cordform.CordformNode
 import net.corda.core.internal.div
 import net.corda.core.internal.list
 import net.corda.core.internal.write
 import net.corda.nodeapi.eventually
+import net.corda.nodeapi.internal.NODE_INFO_DIRECTORY
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
@@ -34,12 +34,12 @@ class NodeInfoFilesCopierTest {
     private val rootPath get() = folder.root.toPath()
     private val scheduler = TestScheduler()
 
-    private fun nodeDir(nodeBaseDir : String) = rootPath.resolve(nodeBaseDir).resolve(ORGANIZATION.toLowerCase())
+    private fun nodeDir(nodeBaseDir: String) = rootPath.resolve(nodeBaseDir).resolve(ORGANIZATION.toLowerCase())
 
     private val node1RootPath by lazy { nodeDir(NODE_1_PATH) }
     private val node2RootPath by lazy { nodeDir(NODE_2_PATH) }
-    private val node1AdditionalNodeInfoPath by lazy { node1RootPath.resolve(CordformNode.NODE_INFO_DIRECTORY) }
-    private val node2AdditionalNodeInfoPath by lazy { node2RootPath.resolve(CordformNode.NODE_INFO_DIRECTORY) }
+    private val node1AdditionalNodeInfoPath by lazy { node1RootPath.resolve(NODE_INFO_DIRECTORY) }
+    private val node2AdditionalNodeInfoPath by lazy { node2RootPath.resolve(NODE_INFO_DIRECTORY) }
 
     private lateinit var nodeInfoFilesCopier: NodeInfoFilesCopier