ENT-11065: Remove the need for JVM flags in client code (corda#7635)

Author: shamsasari

build.gradle

@@ -121,23 +121,6 @@ buildscript {
     ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsVersion")
     ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeVersion")
     ext.javaassist_version = constants.getProperty("javaassistVersion")
-    ext.test_add_opens = [
-            '--add-opens', 'java.base/java.time=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.io=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.util=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.net=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.nio=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.security.cert=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.security=ALL-UNNAMED',
-            '--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
-            '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED',
-            '--add-opens', 'java.sql/java.sql=ALL-UNNAMED'
-    ]
-    ext.test_add_exports = [
-            '--add-exports', 'java.base/sun.nio.ch=ALL-UNNAMED'
-    ]
 
     ext.corda_revision = {
         try {
@@ -282,11 +265,6 @@ allprojects {
         toolVersion = "0.8.7"
     }
 
-    test {
-        jvmArgs test_add_opens
-        jvmArgs test_add_exports
-    }
-
     java {
         withSourcesJar()
         withJavadocJar()
@@ -330,15 +308,14 @@ allprojects {
             attributes('Corda-Docs-Link': corda_docs_link)
         }
     }
-    
+
     tasks.withType(Test).configureEach {
+        jvmArgs += project(":node:capsule").file("src/main/resources/node-jvm-args.txt").readLines()
+        jvmArgs += "--add-modules=jdk.incubator.foreign"  // For the SharedMemoryIncremental
         forkEvery = 20
         ignoreFailures = project.hasProperty('tests.ignoreFailures') ? project.property('tests.ignoreFailures').toBoolean() : false
         failFast = project.hasProperty('tests.failFast') ? project.property('tests.failFast').toBoolean() : false
 
-        // Prevent the project from creating temporary files outside of the build directory.
-        systemProperty 'java.io.tmpdir', buildDir.absolutePath
-
         maxHeapSize = "1g"
 
         if (project.path.startsWith(':experimental') && System.getProperty("experimental.test.enable") == null) {
@@ -351,15 +328,15 @@ allprojects {
 //            ex.append = false
         }
 
-        maxParallelForks = (System.env.CORDA_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_TESTING_FORKS".toInteger()
-
-        systemProperty 'java.security.egd', 'file:/dev/./urandom'
-    }
-
-    tasks.withType(Test).configureEach {
         if (name.contains("integrationTest")) {
             maxParallelForks = (System.env.CORDA_INT_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_INT_TESTING_FORKS".toInteger()
+        } else {
+            maxParallelForks = (System.env.CORDA_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_TESTING_FORKS".toInteger()
         }
+
+        // Prevent the project from creating temporary files outside of the build directory.
+        systemProperty 'java.io.tmpdir', buildDir.absolutePath
+        systemProperty 'java.security.egd', 'file:/dev/./urandom'
     }
 
     group 'net.corda'

client/rpc/build.gradle

@@ -10,6 +10,9 @@ description 'Corda client RPC modules'
 configurations {
     integrationTestImplementation.extendsFrom testImplementation
     integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
+
+    smokeTestImplementation.extendsFrom compile
+    smokeTestRuntimeOnly.extendsFrom runtimeOnly
 }
 
 sourceSets {
@@ -28,55 +31,95 @@ sourceSets {
             srcDirs "src/integration-test/resources"
         }
     }
+    smokeTest {
+        kotlin {
+            // We must NOT have any Node code on the classpath, so do NOT
+            // include the test or integrationTest dependencies here.
+            compileClasspath += main.output
+            runtimeClasspath += main.output
+            srcDir file('src/smoke-test/kotlin')
+        }
+        java {
+            compileClasspath += main.output
+            runtimeClasspath += main.output
+            srcDir file('src/smoke-test/java')
+        }
+    }
 }
 
 dependencies {
     implementation project(':core')
     implementation project(':node-api')
     implementation project(':serialization')
-
     // For caches rather than guava
     implementation "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
-
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "io.reactivex:rxjava:$rxjava_version"
+    implementation("org.apache.activemq:artemis-core-client:${artemis_version}") {
+        exclude group: 'org.jgroups', module: 'jgroups'
+    }
+    implementation "com.google.guava:guava-testlib:$guava_version"
 
+    testImplementation project(':node')
+    testImplementation project(':node-driver')
+    testImplementation project(':client:mock')
+    testImplementation project(':core-test-utils')
     testImplementation "junit:junit:$junit_version"
-
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
-    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
-
     // Unit testing helpers.
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.assertj:assertj-core:${assertj_version}"
     testImplementation "io.dropwizard.metrics:metrics-core:$metrics_version"
 
-    testImplementation project(':node')
-    testImplementation project(':node-driver')
-    testImplementation project(':client:mock')
-    testImplementation project(':core-test-utils')
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     integrationTestImplementation project(path: ':node-api', configuration: 'testArtifacts')
     integrationTestImplementation project(':common-configuration-parsing')
     integrationTestImplementation project(':finance:contracts')
     integrationTestImplementation project(':finance:workflows')
     integrationTestImplementation project(':test-utils')
-
     integrationTestImplementation "co.paralleluniverse:quasar-core:$quasar_version"
     integrationTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockito_kotlin_version"
 
-    implementation "io.reactivex:rxjava:$rxjava_version"
-    implementation("org.apache.activemq:artemis-core-client:${artemis_version}") {
-        exclude group: 'org.jgroups', module: 'jgroups'
+    smokeTestImplementation project(':core')
+    smokeTestImplementation project(':node-api')
+    smokeTestImplementation project(':finance:contracts')
+    smokeTestImplementation project(':finance:workflows')
+    smokeTestImplementation project(':smoke-test-utils')
+    smokeTestImplementation project(':testing:cordapps:sleeping')
+    smokeTestImplementation "junit:junit:$junit_version"
+    smokeTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    smokeTestImplementation "com.google.guava:guava:$guava_version"
+    smokeTestImplementation "org.hamcrest:hamcrest-library:2.1"
+
+    smokeTestRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    smokeTestRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+}
+
+processSmokeTestResources {
+    // Bring in the fully built corda.jar for use by NodeFactory in the smoke tests
+    from(project(":node:capsule").tasks['buildCordaJAR']) {
+        rename 'corda-(.*)', 'corda.jar'
+    }
+    from(project(':finance:workflows').tasks['jar']) {
+        rename '.*finance-workflows-.*', 'cordapp-finance-workflows.jar'
+    }
+    from(project(':finance:contracts').tasks['jar']) {
+        rename '.*finance-contracts-.*', 'cordapp-finance-contracts.jar'
+    }
+    from(project(':testing:cordapps:sleeping').tasks['jar']) {
+        rename 'testing-sleeping-cordapp-*', 'cordapp-sleeping.jar'
     }
-    implementation "com.google.guava:guava-testlib:$guava_version"
 }
 
-task integrationTest(type: Test) {
+tasks.register('integrationTest', Test) {
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
+}
 
-    jvmArgs test_add_opens
-    jvmArgs test_add_exports
+tasks.register('smokeTest', Test) {
+    testClassesDirs = sourceSets.smokeTest.output.classesDirs
+    classpath = sourceSets.smokeTest.runtimeClasspath
 }
 
 jar {

client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt

@@ -54,7 +54,7 @@ import org.junit.Test
 import rx.subjects.PublishSubject
 import java.net.URLClassLoader
 import java.nio.file.Paths
-import java.util.*
+import java.util.Currency
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -255,21 +255,12 @@ class CordaRPCClientTest : NodeBasedTest(FINANCE_CORDAPPS, notaries = listOf(DUM
 	fun `additional class loader used by WireTransaction when it deserialises its components`() {
         val financeLocation = Cash::class.java.location.toPath().toString()
         val classPathWithoutFinance = ProcessUtilities.defaultClassPath.filter { financeLocation !in it }
-        val moduleOpens = listOf(
-                "--add-opens", "java.base/java.time=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED",
-                "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.net=ALL-UNNAMED",
-                "--add-opens", "java.base/java.nio=ALL-UNNAMED", "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
-                "--add-opens", "java.base/java.security.cert=ALL-UNNAMED", "--add-opens", "java.base/javax.net.ssl=ALL-UNNAMED",
-                "--add-opens", "java.base/java.util.concurrent=ALL-UNNAMED", "--add-opens", "java.sql/java.sql=ALL-UNNAMED",
-                "--add-opens", "java.base/java.lang=ALL-UNNAMED"
-        )
 
         // Create a Cash.State object for the StandaloneCashRpcClient to get
         node.services.startFlow(CashIssueFlow(100.POUNDS, OpaqueBytes.of(1), identity), InvocationContext.shell()).flatMap { it.resultFuture }.getOrThrow()
         val outOfProcessRpc = ProcessUtilities.startJavaProcess<StandaloneCashRpcClient>(
                 classPath = classPathWithoutFinance,
-                arguments = listOf(node.node.configuration.rpcOptions.address.toString(), financeLocation),
-                extraJvmArguments = moduleOpens
+                arguments = listOf(node.node.configuration.rpcOptions.address.toString(), financeLocation)
         )
         assertThat(outOfProcessRpc.waitFor()).isZero()  // i.e. no exceptions were thrown
     }

client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt

@@ -89,7 +89,6 @@ class RPCStabilityTests {
     }
 
     @Test(timeout=300_000)
-    @Ignore("TODO JDK17:Fixme")
 	fun `client and server dont leak threads`() {
         fun startAndStop() {
             rpcDriver {
@@ -122,7 +121,6 @@ class RPCStabilityTests {
     }
 
     @Test(timeout=300_000)
-    @Ignore("TODO JDK17:Fixme")
 	fun `client doesnt leak threads when it fails to start`() {
         fun startAndStop() {
             rpcDriver {
@@ -491,7 +489,6 @@ class RPCStabilityTests {
      * In this test we create a number of out of process RPC clients that call [TrackSubscriberOps.subscribe] in a loop.
      */
     @Test(timeout=300_000)
-    @Ignore("TODO JDK17:Fixme")
 	fun `server cleans up queues after disconnected clients`() {
         rpcDriver {
             val trackSubscriberOpsImpl = object : TrackSubscriberOps {
@@ -547,7 +544,7 @@ class RPCStabilityTests {
     }
 
     @Test(timeout=300_000)
-@Ignore // TODO: This is ignored because Artemis slow consumers are broken.  I'm not deleting it in case we can get the feature fixed.
+    @Ignore // TODO: This is ignored because Artemis slow consumers are broken.  I'm not deleting it in case we can get the feature fixed.
     fun `slow consumers are kicked`() {
         rpcDriver {
             val server = startRpcServer(maxBufferedBytesPerClient = 10 * 1024 * 1024, ops = SlowConsumerRPCOpsImpl()).get()

testing/client-rpc/src/smoke-test/java/net/corda/java/rpc/StandaloneCordaRPCJavaClientTest.java client/rpc/src/smoke-test/java/net/corda/java/rpc/StandaloneCordaRPCJavaClientTest.java

@@ -40,7 +40,6 @@ import net.corda.nodeapi.internal.config.User
 import net.corda.sleeping.SleepingFlow
 import net.corda.smoketesting.NodeConfig
 import net.corda.smoketesting.NodeProcess
-import org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM
 import org.hamcrest.text.MatchesPattern
 import org.junit.After
 import org.junit.Before
@@ -50,6 +49,7 @@ import org.junit.Test
 import org.junit.rules.ExpectedException
 import java.io.FilterInputStream
 import java.io.InputStream
+import java.io.OutputStream.nullOutputStream
 import java.util.Currency
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicInteger
@@ -67,7 +67,7 @@ class StandaloneCordaRPClientTest {
         val rpcUser = User("rpcUser", "test", permissions = setOf("InvokeRpc.startFlow", "InvokeRpc.killFlow"))
         val flowUser = User("flowUser", "test", permissions = setOf("StartFlow.net.corda.finance.flows.CashIssueFlow"))
         val port = AtomicInteger(15200)
-        const val attachmentSize = 2116
+        const val ATTACHMENT_SIZE = 2116
         val timeout = 60.seconds
     }
 
@@ -111,13 +111,13 @@ class StandaloneCordaRPClientTest {
 
     @Test(timeout=300_000)
 	fun `test attachments`() {
-        val attachment = InputStreamAndHash.createInMemoryTestZip(attachmentSize, 1)
+        val attachment = InputStreamAndHash.createInMemoryTestZip(ATTACHMENT_SIZE, 1)
         assertFalse(rpcProxy.attachmentExists(attachment.sha256))
         val id = attachment.inputStream.use { rpcProxy.uploadAttachment(it) }
         assertEquals(attachment.sha256, id, "Attachment has incorrect SHA256 hash")
 
-        val hash = HashingInputStream(Hashing.sha256(), rpcProxy.openAttachment(id)).use { it ->
-            it.copyTo(NULL_OUTPUT_STREAM)
+        val hash = HashingInputStream(Hashing.sha256(), rpcProxy.openAttachment(id)).use {
+            it.copyTo(nullOutputStream())
             SecureHash.createSHA256(it.hash().asBytes())
         }
         assertEquals(attachment.sha256, hash)
@@ -126,13 +126,13 @@ class StandaloneCordaRPClientTest {
     @Ignore("CORDA-1520 - After switching from Kryo to AMQP this test won't work")
     @Test(timeout=300_000)
 	fun `test wrapped attachments`() {
-        val attachment = InputStreamAndHash.createInMemoryTestZip(attachmentSize, 1)
+        val attachment = InputStreamAndHash.createInMemoryTestZip(ATTACHMENT_SIZE, 1)
         assertFalse(rpcProxy.attachmentExists(attachment.sha256))
         val id = WrapperStream(attachment.inputStream).use { rpcProxy.uploadAttachment(it) }
         assertEquals(attachment.sha256, id, "Attachment has incorrect SHA256 hash")
 
-        val hash = HashingInputStream(Hashing.sha256(), rpcProxy.openAttachment(id)).use { it ->
-            it.copyTo(NULL_OUTPUT_STREAM)
+        val hash = HashingInputStream(Hashing.sha256(), rpcProxy.openAttachment(id)).use {
+            it.copyTo(nullOutputStream())
             SecureHash.createSHA256(it.hash().asBytes())
         }
         assertEquals(attachment.sha256, hash)

testing/client-rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt

@@ -107,6 +107,7 @@ dependencies {
     smokeTestRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
     smokeTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
     smokeTestRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    smokeTestRuntimeOnly "org.slf4j:slf4j-simple:$slf4j_version"
 
     smokeTestCompile project(':smoke-test-utils')
     smokeTestCompile "org.assertj:assertj-core:${assertj_version}"
@@ -143,9 +144,6 @@ task smokeTest(type: Test) {
     dependsOn smokeTestJar
     testClassesDirs = sourceSets.smokeTest.output.classesDirs
     classpath = sourceSets.smokeTest.runtimeClasspath
-
-    jvmArgs test_add_opens
-    jvmArgs test_add_exports
 }
 
 idea {

core-tests/build.gradle

@@ -48,7 +48,7 @@ class NodeVersioningTest {
             users = listOf(superUser)
     )
 
-    private lateinit var notary: NodeProcess
+    private var notary: NodeProcess? = null
 
     @Before
     fun setUp() {
@@ -57,7 +57,7 @@ class NodeVersioningTest {
 
     @After
     fun done() {
-        notary.close()
+        notary?.close()
     }
 
     @Test(timeout=300_000)