Capture file moves to separate Node implementation code into its own gradle module and leave only demo code in top level src folders.

I have to temporarily break\disable the IRS demo to which has a circular dependency. Will fix next.

.idea/modules.xml

@@ -11,6 +11,9 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated.iml" group="contracts/isolated" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_main.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_main.iml" group="contracts/isolated" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_test.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_test.iml" group="contracts/isolated" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node.iml" group="node" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node_main.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node_main.iml" group="node" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node_test.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node_test.iml" group="node" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" group="r3prototyping" />

build.gradle

@@ -50,73 +50,16 @@ configurations {
 // build/reports/project/dependencies/index.html for green highlighted parts of the tree.
 
 dependencies {
-    compile project(':contracts')
-
-    compile "com.google.code.findbugs:jsr305:3.0.1"
-    compile "org.slf4j:slf4j-jdk14:1.7.13"
+    compile project(':node')
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.1"
 
-    compile "com.google.guava:guava:19.0"
-
-    // JOpt: for command line flags.
-    compile "net.sf.jopt-simple:jopt-simple:4.9"
-
     // Quasar: for the bytecode rewriting for state machines.
     quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar"
 
-    // Artemis: for reliable p2p message queues.
-    compile "org.apache.activemq:artemis-server:${artemis_version}"
-    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
-
-    // JAnsi: for drawing things to the terminal in nicely coloured ways.
-    compile "org.fusesource.jansi:jansi:1.11"
-
-    // GraphStream: For visualisation
-    compile "org.graphstream:gs-core:1.3"
-    compile "org.graphstream:gs-ui:1.3"
-    compile("com.intellij:forms_rt:7.0.3") {
-        exclude group: "asm"
-    }
-
-    // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424)
-    compile "commons-logging:commons-logging:1.2"
-
-    // Web stuff: for HTTP[S] servlets
-    compile "org.eclipse.jetty:jetty-servlet:${jetty_version}"
-    compile "org.eclipse.jetty:jetty-webapp:${jetty_version}"
-    compile "javax.servlet:javax.servlet-api:3.1.0"
-    compile "org.jolokia:jolokia-agent-war:2.0.0-M1"
-    compile "commons-fileupload:commons-fileupload:1.3.1"
-
-    // Jersey for JAX-RS implementation for use in Jetty
-    compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
-    compile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}"
-    compile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}"
-    // NOTE there is a Jackson version clash between jersey-media-json-jackson (v2.5.4) and jackson-module-kotlin (v.2.5.5)
-    // Have not found an Issue in the issue tracker for Jersey for this issue
-    compile ("org.glassfish.jersey.media:jersey-media-json-jackson:${jersey_version}") {
-        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
-        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
-        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
-    }
-    compile ("com.fasterxml.jackson.module:jackson-module-kotlin:2.5.5-2") {
-        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
-    }
-    compile "com.fasterxml.jackson.core:jackson-annotations:2.5.5"
-
-    // Coda Hale's Metrics: for monitoring of key statistics
-    compile "io.dropwizard.metrics:metrics-core:3.1.2"
-
-    // JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
-    compile "com.google.jimfs:jimfs:1.1"
-
-    // TypeSafe Config: for simple and human friendly config files.
-    compile "com.typesafe:config:1.3.0"
-
     // Unit testing helpers.
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:3.4.1'
@@ -165,7 +108,7 @@ task getIRSDemo(type: CreateStartScripts) {
 // TODO: Make this task incremental, as it can be quite slow.
 
 //noinspection GroovyAssignabilityCheck
-task quasarScan(dependsOn: ['classes', 'core:classes', 'contracts:classes']) << {
+task quasarScan(dependsOn: ['classes', 'core:classes', 'contracts:classes', 'node:classes']) << {
     ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner',
             classpath: "${sourceSets.main.output.classesDir}:${sourceSets.main.output.resourcesDir}:${configurations.runtime.asPath}")
     delete "$sourceSets.main.output.resourcesDir/META-INF/suspendables", "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers"

node/build.gradle

@@ -0,0 +1,132 @@
+group 'com.r3cev.prototyping'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url 'http://oss.sonatype.org/content/repositories/snapshots'
+    }
+    jcenter()
+}
+
+
+//noinspection GroovyAssignabilityCheck
+configurations {
+    quasar
+
+    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
+    runtime.exclude module: 'isolated'
+}
+
+// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
+// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
+
+dependencies {
+    compile project(':contracts')
+
+    compile "com.google.code.findbugs:jsr305:3.0.1"
+    compile "org.slf4j:slf4j-jdk14:1.7.13"
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.1"
+
+    compile "com.google.guava:guava:19.0"
+
+    // JOpt: for command line flags.
+    compile "net.sf.jopt-simple:jopt-simple:4.9"
+
+    // Artemis: for reliable p2p message queues.
+    compile "org.apache.activemq:artemis-server:${artemis_version}"
+    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
+
+    // JAnsi: for drawing things to the terminal in nicely coloured ways.
+    compile "org.fusesource.jansi:jansi:1.11"
+
+    // GraphStream: For visualisation
+    compile "org.graphstream:gs-core:1.3"
+    compile "org.graphstream:gs-ui:1.3"
+    compile("com.intellij:forms_rt:7.0.3") {
+        exclude group: "asm"
+    }
+
+    // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424)
+    compile "commons-logging:commons-logging:1.2"
+
+    // Web stuff: for HTTP[S] servlets
+    compile "org.eclipse.jetty:jetty-servlet:${jetty_version}"
+    compile "org.eclipse.jetty:jetty-webapp:${jetty_version}"
+    compile "javax.servlet:javax.servlet-api:3.1.0"
+    compile "org.jolokia:jolokia-agent-war:2.0.0-M1"
+    compile "commons-fileupload:commons-fileupload:1.3.1"
+
+    // Jersey for JAX-RS implementation for use in Jetty
+    compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
+    compile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}"
+    compile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}"
+    // NOTE there is a Jackson version clash between jersey-media-json-jackson (v2.5.4) and jackson-module-kotlin (v.2.5.5)
+    // Have not found an Issue in the issue tracker for Jersey for this issue
+    compile ("org.glassfish.jersey.media:jersey-media-json-jackson:${jersey_version}") {
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+    }
+    compile ("com.fasterxml.jackson.module:jackson-module-kotlin:2.5.5-2") {
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
+    }
+    compile "com.fasterxml.jackson.core:jackson-annotations:2.5.5"
+
+    // Coda Hale's Metrics: for monitoring of key statistics
+    compile "io.dropwizard.metrics:metrics-core:3.1.2"
+
+    // JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
+    compile "com.google.jimfs:jimfs:1.1"
+
+    // TypeSafe Config: for simple and human friendly config files.
+    compile "com.typesafe:config:1.3.0"
+
+    // Quasar: for the bytecode rewriting for state machines.
+    quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar"
+
+    // Unit testing helpers.
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:3.4.1'
+}
+
+tasks.withType(Test) {
+    jvmArgs "-javaagent:${configurations.quasar.singleFile}"
+    jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation"
+}
+tasks.withType(JavaExec) {
+    jvmArgs "-javaagent:${configurations.quasar.singleFile}"
+    jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation"
+}
+
+
+// These lines tell gradle to run the Quasar suspendables scanner to look for unannotated super methods
+// that have @Suspendable sub implementations.  These tend to cause NPEs and are not caught by the verifier
+// NOTE: need to make sure the output isn't on the classpath or every other run it generates empty results, so
+// we explicitly delete to avoid that happening.  We also need to turn off what seems to be a spurious warning in the IDE
+//
+// TODO: Make this task incremental, as it can be quite slow.
+
+//noinspection GroovyAssignabilityCheck
+task quasarScan(dependsOn: ['classes', ':core:classes', ':contracts:classes']) << {
+    ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner',
+            classpath: "${sourceSets.main.output.classesDir}:${sourceSets.main.output.resourcesDir}:${configurations.runtime.asPath}")
+    delete "$sourceSets.main.output.resourcesDir/META-INF/suspendables", "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers"
+    ant.scanSuspendables(
+            auto:false,
+            suspendablesFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendables",
+            supersFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") {
+        fileset(dir: sourceSets.main.output.classesDir)
+    }
+}
+
+jar.dependsOn quasarScan
+

node/src/main/kotlin/core/node/Node.kt

@@ -1,7 +1,7 @@
 package core.node
 
 import api.Config
-import api.InterestRateSwapAPI
+//import api.InterestRateSwapAPI
 import api.ResponseFilter
 import com.codahale.metrics.JmxReporter
 import com.google.common.net.HostAndPort
@@ -103,7 +103,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration
             resourceConfig.register(Config(services))
             resourceConfig.register(ResponseFilter())
             resourceConfig.register(api)
-            resourceConfig.register(InterestRateSwapAPI(api))
+            //resourceConfig.register(InterestRateSwapAPI(api))
             // Give the app a slightly better name in JMX rather than a randomly generated one and enable JMX
             resourceConfig.addProperties(mapOf(ServerProperties.APPLICATION_NAME to "node.api",
                     ServerProperties.MONITORING_STATISTICS_MBEANS_ENABLED to "true"))

settings.gradle

@@ -2,3 +2,4 @@ rootProject.name = 'r3prototyping'
 include 'contracts'
 include 'contracts:isolated'
 include 'core'
+include 'node'

src/main/kotlin/demos/api/InterestRateSwapAPI.kt

@@ -1,5 +1,6 @@
-package api
+package demo.api
 
+import api.*
 import contracts.InterestRateSwap
 import core.utilities.loggerFor
 import demos.protocols.AutoOfferProtocol