diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/utils/CacheOperations.kt b/quartz/src/main/java/com/vitorpamplona/quartz/utils/CacheOperations.kt index b1c9a9ccc..c44ff5814 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/utils/CacheOperations.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/utils/CacheOperations.kt @@ -123,24 +123,12 @@ interface CacheOperations { return runner.results } - fun associateNotNull(transform: (K, V) -> Pair?): Map { - val runner = CacheCollectors.BiAssociateNotNullCollector(size(), transform) - forEach(runner) - return runner.results - } - fun associateWith(transform: (K, V) -> U?): Map { val runner = CacheCollectors.BiAssociateWithCollector(size(), transform) forEach(runner) return runner.results } - fun associateNotNullWith(transform: (K, V) -> U): Map { - val runner = CacheCollectors.BiAssociateNotNullWithCollector(size(), transform) - forEach(runner) - return runner.results - } - fun joinToString( separator: CharSequence = ", ", prefix: CharSequence = "", diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeCache.kt b/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeCache.kt index 962932c9a..fe59fca30 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeCache.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeCache.kt @@ -67,7 +67,7 @@ class LargeCache : CacheOperations { key: K, builder: (key: K) -> V, ): Boolean { - val value = cache.get(key) + val value = cache[key] return if (value != null) { false } else { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeSoftCache.kt b/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeSoftCache.kt index 17f9ba265..995c0701c 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeSoftCache.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/utils/LargeSoftCache.kt @@ -78,7 +78,7 @@ class LargeSoftCache : CacheOperations { key: K, builder: (key: K) -> V, ): V { - val softRef = cache.get(key) + val softRef = cache[key] val value = softRef?.get() return if (value != null) { @@ -89,20 +89,6 @@ class LargeSoftCache : CacheOperations { } } - fun createIfAbsent( - key: K, - builder: (key: K) -> V, - ): Boolean { - val softRef = cache.get(key) - val value = softRef?.get() - return if (value != null) { - false - } else { - val newObject = builder(key) - cache.putIfAbsent(key, WeakReference(newObject)) == null - } - } - /** * Proactively cleans up the cache by removing entries whose weakly referenced * objects have been garbage collected. While `get` handles cleanup on access,