Incorporate comments from PR

core/src/main/kotlin/com/r3corda/core/node/CordaPluginRegistry.kt

@@ -4,20 +4,20 @@ package com.r3corda.core.node
  * Implement this interface on a class advertised in a META-INF/services/com.r3corda.core.node.CordaPluginRegistry file
  * to extend a Corda node with additional application services.
  */
-interface CordaPluginRegistry {
+abstract class CordaPluginRegistry {
     /**
      * List of JAX-RS classes inside the contract jar. They are expected to have a single parameter constructor that takes a ServiceHub as input.
-     * These are listed as Class<*>, because they will be instantiated inside an AttachmentClassLoader so that subsequent protocols, contracts, etc
-     * will be running in the appropriate isolated context.
+     * These are listed as Class<*>, because in the future they will be instantiated inside a ClassLoader so that
+     * Cordapp code can be loaded dynamically.
      */
-    val webApis: List<Class<*>>
+    open val webApis: List<Class<*>> = emptyList()
 
     /**
      * Map of static serving endpoints to the matching resource directory. All endpoints will be prefixed with "/web" and postfixed with "\*.
      * Resource directories can be either on disk directories (especially when debugging) in the form "a/b/c". Serving from a JAR can
      *  be specified with: javaClass.getResource("<folder-in-jar>").toExternalForm()
      */
-    val staticServeDirs: Map<String, String>
+    open val staticServeDirs: Map<String, String> = emptyMap()
 
     /**
      * A Map with an entry for each consumed protocol used by the webAPIs.
@@ -26,7 +26,7 @@ interface CordaPluginRegistry {
      * Standard java.lang.* and kotlin.* types do not need to be included explicitly.
      * This is used to extend the white listed protocols that can be initiated from the ServiceHub invokeProtocolAsync method.
      */
-    val requiredProtocols: Map<String, Set<String>>
+    open val requiredProtocols: Map<String, Set<String>> = emptyMap()
 
     /**
      * List of additional long lived services to be hosted within the node.
@@ -34,5 +34,5 @@ interface CordaPluginRegistry {
      * The ServiceHubInternal will be fully constructed before the plugin service is created and will
      * allow access to the protocol factory and protocol initiation entry points there.
      */
-    val servicePlugins: List<Class<*>>
+    open val servicePlugins: List<Class<*>> = emptyList()
 }

node/src/main/kotlin/com/r3corda/node/internal/testing/Simulation.kt

@@ -117,7 +117,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             return object : SimulatedNode(dir, cfg, network, networkMapAddr, advertisedServices, id, keyPair) {
                 override fun start(): MockNetwork.MockNode {
                     super.start()
-                    getCustomService<NodeInterestRates.Service>().upload(javaClass.getResourceAsStream("example.rates.txt"))
+                    findService<NodeInterestRates.Service>().upload(javaClass.getResourceAsStream("example.rates.txt"))
                     return this
                 }
             }

node/src/main/kotlin/com/r3corda/node/services/NotaryChangeService.kt

@@ -9,10 +9,7 @@ import com.r3corda.protocols.NotaryChangeProtocol
 
 
 object NotaryChange {
-    class Plugin : CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
-        override val staticServeDirs: Map<String, String> = emptyMap()
+    class Plugin : CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }
 

node/src/main/kotlin/com/r3corda/node/services/clientapi/FixingSessionInitiation.kt

@@ -13,10 +13,7 @@ import com.r3corda.protocols.TwoPartyDealProtocol
  * TODO: This will be replaced with the automatic sessionID / session setup work.
  */
 object FixingSessionInitiation {
-    class Plugin: CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
+    class Plugin: CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }
 

node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt

@@ -46,9 +46,7 @@ object NodeInterestRates {
     /**
      * Register the protocol that is used with the Fixing integration tests.
      */
-    class Plugin : CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
+    class Plugin : CordaPluginRegistry() {
         override val requiredProtocols: Map<String, Set<String>> = mapOf(Pair(TwoPartyDealProtocol.FixingRoleDecider::class.java.name, setOf(Duration::class.java.name, StateRef::class.java.name)))
         override val servicePlugins: List<Class<*>> = listOf(NodeInterestRates.Service::class.java)
     }

node/src/main/kotlin/com/r3corda/node/services/persistence/DataVendingService.kt

@@ -16,10 +16,7 @@ import javax.annotation.concurrent.ThreadSafe
 
 object DataVending {
 
-    class Plugin : CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
+    class Plugin : CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }
 

node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt

@@ -105,7 +105,7 @@ class NodeInterestRatesTest {
     fun network() {
         val net = MockNetwork()
         val (n1, n2) = net.createTwoNodes()
-        n2.getCustomService<NodeInterestRates.Service>().oracle.knownFixes = TEST_DATA
+        n2.findService<NodeInterestRates.Service>().oracle.knownFixes = TEST_DATA
 
         val tx = TransactionType.General.Builder()
         val fixOf = NodeInterestRates.parseFixOf("LIBOR 2016-03-16 1M")

src/main/kotlin/com/r3corda/demos/IRSDemo.kt

@@ -257,14 +257,13 @@ object CliParamsSpec {
     val help = parser.accepts("help", "Prints this help").forHelp()
 }
 
-class IRSDemoPluginRegistry : CordaPluginRegistry {
+class IRSDemoPluginRegistry : CordaPluginRegistry() {
     override val webApis: List<Class<*>> = listOf(InterestRateSwapAPI::class.java)
     override val staticServeDirs: Map<String, String> = mapOf("irsdemo" to javaClass.getResource("irswebdemo").toExternalForm())
     override val requiredProtocols: Map<String, Set<String>> = mapOf(
             Pair(AutoOfferProtocol.Requester::class.java.name, setOf(InterestRateSwap.State::class.java.name)),
             Pair(UpdateBusinessDayProtocol.Broadcast::class.java.name, setOf(java.time.LocalDate::class.java.name)),
             Pair(ExitServerProtocol.Broadcast::class.java.name, setOf(kotlin.Int::class.java.name)))
-    override val servicePlugins: List<Class<*>> = emptyList()
 }
 
 private class NotSetupException: Throwable {

src/main/kotlin/com/r3corda/demos/protocols/AutoOfferProtocol.kt

@@ -28,10 +28,7 @@ object AutoOfferProtocol {
                                 val notary: Party,
                                 val otherSessionID: Long, val dealBeingOffered: DealState)
 
-    class Plugin: CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
+    class Plugin: CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }
 

src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt

@@ -20,10 +20,7 @@ object ExitServerProtocol {
 
     data class ExitMessage(val exitCode: Int)
 
-    class Plugin: CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
+    class Plugin: CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }
 

src/main/kotlin/com/r3corda/demos/protocols/UpdateBusinessDayProtocol.kt

@@ -21,10 +21,7 @@ object UpdateBusinessDayProtocol {
 
     data class UpdateBusinessDayMessage(val date: LocalDate)
 
-    class Plugin: CordaPluginRegistry {
-        override val webApis: List<Class<*>> = emptyList()
-        override val staticServeDirs: Map<String, String> = emptyMap()
-        override val requiredProtocols: Map<String, Set<String>> = emptyMap()
+    class Plugin: CordaPluginRegistry() {
         override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
     }