Fix invariants on bulk and loading cache builders

Author: sksamuel

aedile-core/src/main/kotlin/com/sksamuel/aedile/core/builders.kt

@@ -45,7 +45,7 @@ fun <K : Any?, V : Any?> Caffeine<in K, in V>.asCache(scope: CoroutineScope): Ca
  * If the suspendable computation throws or computes a null value then the
  * entry will be automatically removed.
  */
-fun <K, V> Caffeine<Any, Any>.asLoadingCache(compute: suspend (K) -> V): LoadingCache<K, V> {
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asLoadingCache(compute: suspend (K) -> V): LoadingCache<K, V> {
    val scope = CoroutineScope(Dispatchers.IO + CoroutineName("Aedile-AsyncLoadingCache-Scope") + SupervisorJob())
    return asLoadingCache(scope, compute)
 }
@@ -59,7 +59,7 @@ fun <K, V> Caffeine<Any, Any>.asLoadingCache(compute: suspend (K) -> V): Loading
  * If the suspendable computation throws or computes a null value then the
  * entry will be automatically removed.
  */
-fun <K, V> Caffeine<Any, Any>.asLoadingCache(
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asLoadingCache(
    scope: CoroutineScope,
    compute: suspend (K) -> V
 ): LoadingCache<K, V> {
@@ -78,7 +78,7 @@ fun <K, V> Caffeine<Any, Any>.asLoadingCache(
  * The [reloadCompute] function is invoked to refresh an entry if refreshAfterWrite
  * is enabled or refresh is invoked. See full docs [AsyncCacheLoader.asyncReload].
  */
-fun <K, V> Caffeine<Any, Any>.asLoadingCache(
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asLoadingCache(
    compute: suspend (K) -> V,
    reloadCompute: suspend (K, V) -> V,
 ): LoadingCache<K, V> {
@@ -100,7 +100,7 @@ fun <K, V> Caffeine<Any, Any>.asLoadingCache(
  *
  * The compute functions will execute on the given [scope].
  */
-fun <K, V> Caffeine<Any, Any>.asLoadingCache(
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asLoadingCache(
    scope: CoroutineScope,
    compute: suspend (K) -> V,
    reloadCompute: suspend (K, V) -> V,
@@ -125,7 +125,7 @@ fun <K, V> Caffeine<Any, Any>.asLoadingCache(
  * If the suspendable computation throws or computes a null value then the
  * entry will be automatically removed.
  */
-fun <K, V> Caffeine<Any, Any>.asBulkLoadingCache(compute: suspend (Set<K>) -> Map<K, V>): LoadingCache<K, V> {
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asBulkLoadingCache(compute: suspend (Set<K>) -> Map<K, V>): LoadingCache<K, V> {
    val scope = CoroutineScope(Dispatchers.IO + CoroutineName("Aedile-AsyncLoadingCache-Scope") + SupervisorJob())
    return asBulkLoadingCache(scope, compute)
 }
@@ -141,7 +141,7 @@ fun <K, V> Caffeine<Any, Any>.asBulkLoadingCache(compute: suspend (Set<K>) -> Ma
  *
  * The compute function will execute on the given [scope].
  */
-fun <K, V> Caffeine<Any, Any>.asBulkLoadingCache(
+fun <K : Any?, V : Any?> Caffeine<in K, in V>.asBulkLoadingCache(
    scope: CoroutineScope,
    compute: suspend (Set<K>) -> Map<K, V>
 ): LoadingCache<K, V> {

aedile-core/src/test/kotlin/com/sksamuel/aedile/core/AsLoadingCacheTest.kt

@@ -1,6 +1,7 @@
 package com.sksamuel.aedile.core
 
 import com.github.benmanes.caffeine.cache.Caffeine
+import com.github.benmanes.caffeine.cache.Expiry
 import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
@@ -9,6 +10,7 @@ import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.yield
+import org.checkerframework.checker.index.qual.NonNegative
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -316,5 +318,40 @@ class AsLoadingCacheTest : FunSpec() {
          cache.contains("wibble") shouldBe true
          cache.contains("bubble") shouldBe false
       }
+
+      test("check invariants on expire after") {
+         val loggerExpiry = object : Expiry<Int, String> {
+            override fun expireAfterRead(
+               key: Int?,
+               value: String?,
+               currentTime: Long,
+               currentDuration: @NonNegative Long
+            ): Long {
+               return 0
+            }
+
+            override fun expireAfterCreate(key: Int?, value: String?, currentTime: Long): Long {
+               return 0
+            }
+
+            override fun expireAfterUpdate(
+               key: Int?,
+               value: String?,
+               currentTime: Long,
+               currentDuration: @NonNegative Long
+            ): Long {
+               return 0
+            }
+         }
+
+         Caffeine.newBuilder()
+            .maximumSize(2000)
+            .initialCapacity(500)
+            .expireAfter(loggerExpiry)
+            .asLoadingCache<Int, String> {
+               delay(1)
+               "bar"
+            }
+      }
    }
 }