ENT-11443 Function sig changes to support removing enterprise compiler warnings (corda#7671)

Author: chriscochrane

client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ClientCacheFactory.kt

@@ -7,12 +7,12 @@ import com.github.benmanes.caffeine.cache.LoadingCache
 import net.corda.core.internal.NamedCacheFactory
 
 class ClientCacheFactory : NamedCacheFactory {
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         checkCacheName(name)
         return caffeine.build<K, V>()
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         checkCacheName(name)
         return caffeine.build<K, V>(loader)
     }

core/src/main/kotlin/net/corda/core/internal/NamedCache.kt

@@ -22,11 +22,11 @@ interface NamedCacheFactory {
         require(allowedChars.matches(name)) { "Invalid characters in cache name" }
     }
 
-    fun <K, V> buildNamed(name: String): Cache<K, V> = buildNamed(Caffeine.newBuilder(), name)
+    fun <K : Any, V : Any> buildNamed(name: String): Cache<K, V> = buildNamed(Caffeine.newBuilder(), name)
 
-    fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V>
+    fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V>
 
-    fun <K, V> buildNamed(name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> = buildNamed(Caffeine.newBuilder(), name, loader)
+    fun <K : Any, V : Any> buildNamed(name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> = buildNamed(Caffeine.newBuilder(), name, loader)
 
-    fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V>
+    fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V>
 }

core/src/test/kotlin/net/corda/core/internal/NamedCacheTest.kt

@@ -8,11 +8,11 @@ import org.junit.Test
 import kotlin.test.assertEquals
 
 class NamedCacheTest : NamedCacheFactory {
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         throw IllegalStateException("Should not be called")
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         throw IllegalStateException("Should not be called")
     }
 

node/src/main/kotlin/net/corda/node/migration/MigrationNamedCacheFactory.kt

@@ -44,11 +44,11 @@ class MigrationNamedCacheFactory(private val metricRegistry: MetricRegistry?,
         }
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         return configuredForNamed(caffeine, name).build()
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         return configuredForNamed(caffeine, name).build(loader)
     }
 

node/src/main/kotlin/net/corda/node/utilities/NodeNamedCache.kt

@@ -79,12 +79,12 @@ open class DefaultNamedCacheFactory protected constructor(private val metricRegi
         checkNotNull(nodeConfiguration)
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         checkState(name)
         return configuredForNamed(caffeine, name).build<K, V>()
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         checkState(name)
         return configuredForNamed(caffeine, name).build<K, V>(loader)
     }

testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestingNamedCacheFactory.kt

@@ -16,12 +16,12 @@ class TestingNamedCacheFactory private constructor(private val sizeOverride: Lon
     override fun bindWithMetrics(metricRegistry: MetricRegistry): BindableNamedCacheFactory = TestingNamedCacheFactory(sizeOverride, metricRegistry, this.nodeConfiguration)
     override fun bindWithConfig(nodeConfiguration: NodeConfiguration): BindableNamedCacheFactory = TestingNamedCacheFactory(sizeOverride, this.metricRegistry, nodeConfiguration)
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         // Does not check metricRegistry or nodeConfiguration, because for tests we don't care.
         return caffeine.maximumSize(sizeOverride).build<K, V>()
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         // Does not check metricRegistry or nodeConfiguration, because for tests we don't care.
         val configuredCaffeine = when (name) {
             "DBTransactionStorage_transactions" -> caffeine.maximumWeight(1.MB)

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

@@ -12,12 +12,12 @@ class ExternalVerifierNamedCacheFactory : NamedCacheFactory {
         private const val DEFAULT_CACHE_SIZE = 1024L
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String): Cache<K, V> {
         checkCacheName(name)
         return configure(caffeine, name).build()
     }
 
-    override fun <K, V> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
+    override fun <K : Any, V : Any> buildNamed(caffeine: Caffeine<in K, in V>, name: String, loader: CacheLoader<K, V>): LoadingCache<K, V> {
         checkCacheName(name)
         return configure(caffeine, name).build(loader)
     }