Core doesn't need a compile dep on guava (corda#1283)

sreerajs · Aug 29, 2017 · cd0ab40 · cd0ab40
1 parent e2f112c
commit cd0ab40
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/client/jackson/build.gradle b/client/jackson/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"
     // This adds support for java.time types.
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    compile "com.google.guava:guava:$guava_version"
 
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile "junit:junit:$junit_version"

diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
@@ -116,7 +116,8 @@ class RPCClientProxyHandler(
 
     private fun createRpcObservableMap(): RpcObservableMap {
         val onObservableRemove = RemovalListener<RPCApi.ObservableId, UnicastSubject<Notification<*>>> {
-            val rpcCallSite = callSiteMap?.remove(it.key.toLong)
+            val observableId = it.key!!
+            val rpcCallSite = callSiteMap?.remove(observableId.toLong)
             if (it.cause == RemovalCause.COLLECTED) {
                 log.warn(listOf(
                         "A hot observable returned from an RPC was never subscribed to.",
@@ -126,7 +127,7 @@ class RPCClientProxyHandler(
                         "will appear less frequently in future versions of the platform and you can ignore it",
                         "if you want to.").joinToString(" "), rpcCallSite)
             }
-            observablesToReap.locked { observables.add(it.key) }
+            observablesToReap.locked { observables.add(observableId) }
         }
         return CacheBuilder.newBuilder().
                 weakValues().

diff --git a/core/build.gradle b/core/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     // Guava: Google utilities library.
-    compile "com.google.guava:guava:$guava_version"
+    testCompile "com.google.guava:guava:$guava_version"
 
     // RxJava: observable streams of events.
     compile "io.reactivex:rxjava:$rxjava_version"

diff --git a/finance/build.gradle b/finance/build.gradle
@@ -15,6 +15,8 @@ dependencies {
     // and CorDapps using :finance features should use 'cordapp' not 'compile' linkage.
     cordaCompile project(':core')
 
+    compile "com.google.guava:guava:$guava_version"
+
     testCompile project(':test-utils')
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile "junit:junit:$junit_version"
@@ -39,4 +41,4 @@ jar {
 
 publish {
     name jar.baseName
-}
+}