Unduplicate certificatesDirectory (#740)

node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt

@@ -10,4 +10,9 @@ interface SSLConfiguration {
     val sslKeystore: Path get() = certificatesDirectory / "sslkeystore.jks"
     val nodeKeystore: Path get() = certificatesDirectory / "nodekeystore.jks"
     val trustStoreFile: Path get() = certificatesDirectory / "truststore.jks"
-}
+}
+
+interface NodeSSLConfiguration : SSLConfiguration {
+    val baseDirectory: Path
+    override val certificatesDirectory: Path get() = baseDirectory / "certificates"
+}

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

@@ -1,7 +1,6 @@
 package net.corda.node.services.config
 
 import com.google.common.net.HostAndPort
-import net.corda.core.div
 import net.corda.core.node.VersionInfo
 import net.corda.core.node.services.ServiceInfo
 import net.corda.node.internal.NetworkMapInfo
@@ -11,16 +10,14 @@ import net.corda.node.services.messaging.CertificateChainCheckPolicy
 import net.corda.node.services.network.NetworkMapService
 import net.corda.node.utilities.TestClock
 import net.corda.nodeapi.User
+import net.corda.nodeapi.config.NodeSSLConfiguration
 import net.corda.nodeapi.config.OldConfig
-import net.corda.nodeapi.config.SSLConfiguration
 import org.bouncycastle.asn1.x500.X500Name
 import java.net.URL
 import java.nio.file.Path
 import java.util.*
 
-interface NodeConfiguration : SSLConfiguration {
+interface NodeConfiguration : NodeSSLConfiguration {
-    val baseDirectory: Path
-    override val certificatesDirectory: Path get() = baseDirectory / "certificates"
     val myLegalName: X500Name
     val networkMapService: NetworkMapInfo?
     val minimumPlatformVersion: Int

verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt

@@ -21,6 +21,7 @@ import net.corda.nodeapi.ArtemisMessagingComponent.Companion.NODE_USER
 import net.corda.nodeapi.ArtemisTcpTransport
 import net.corda.nodeapi.ConnectionDirection
 import net.corda.nodeapi.VerifierApi
+import net.corda.nodeapi.config.NodeSSLConfiguration
 import net.corda.nodeapi.config.SSLConfiguration
 import org.apache.activemq.artemis.api.core.SimpleString
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient
@@ -182,8 +183,8 @@ data class VerifierDriverDSL(
 
     private fun startVerificationRequestorInternal(name: X500Name, hostAndPort: HostAndPort): VerificationRequestorHandle {
         val baseDir = driverDSL.driverDirectory / name.commonName
-        val sslConfig = object : SSLConfiguration {
+        val sslConfig = object : NodeSSLConfiguration {
-            override val certificatesDirectory = baseDir / "certificates"
+            override val baseDirectory = baseDir
             override val keyStorePassword: String get() = "cordacadevpass"
             override val trustStorePassword: String get() = "trustpass"
         }

verifier/src/main/kotlin/net/corda/verifier/Verifier.kt

@@ -13,20 +13,19 @@ import net.corda.nodeapi.ArtemisTcpTransport.Companion.tcpTransport
 import net.corda.nodeapi.ConnectionDirection
 import net.corda.nodeapi.VerifierApi
 import net.corda.nodeapi.VerifierApi.VERIFICATION_REQUESTS_QUEUE_NAME
-import net.corda.nodeapi.config.SSLConfiguration
+import net.corda.nodeapi.config.NodeSSLConfiguration
 import net.corda.nodeapi.config.getValue
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient
 import java.nio.file.Path
 import java.nio.file.Paths
 
 data class VerifierConfiguration(
-        val baseDirectory: Path,
+        override val baseDirectory: Path,
         val config: Config
-) : SSLConfiguration {
+) : NodeSSLConfiguration {
     val nodeHostAndPort: HostAndPort by config
     override val keyStorePassword: String by config
     override val trustStorePassword: String by config
-    override val certificatesDirectory = baseDirectory / "certificates"
 }
 
 class Verifier {

webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt

@@ -2,16 +2,14 @@ package net.corda.webserver
 
 import com.google.common.net.HostAndPort
 import com.typesafe.config.Config
-import net.corda.core.div
+import net.corda.nodeapi.config.NodeSSLConfiguration
-import net.corda.nodeapi.config.SSLConfiguration
 import net.corda.nodeapi.config.getValue
 import java.nio.file.Path
 
 /**
  * [baseDirectory] is not retrieved from the config file but rather from a command line argument.
  */
-class WebServerConfig(val baseDirectory: Path, val config: Config) : SSLConfiguration {
+class WebServerConfig(override val baseDirectory: Path, val config: Config) : NodeSSLConfiguration {
-    override val certificatesDirectory: Path get() = baseDirectory / "certificates"
     override val keyStorePassword: String by config
     override val trustStorePassword: String by config
     val exportJMXto: String get() = "http"
@@ -19,4 +17,4 @@ class WebServerConfig(val baseDirectory: Path, val config: Config) : SSLConfigur
     val myLegalName: String by config
     val p2pAddress: HostAndPort by config // TODO: Use RPC port instead of P2P port (RPC requires authentication, P2P does not)
     val webAddress: HostAndPort by config
-}
+}