update caffeine dependency and fix compile errors

Signed-off-by: Johannes Schneider <johannes.schneider@bosch.io>
eclipse-ditto · Aug 30, 2021 · 9f3f8f4 · 9f3f8f4
1 parent 7fb60f5
commit 9f3f8f4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -89,7 +89,7 @@
         -->
         <js.long.version>3.2.0</js.long.version>
 
-        <caffeine.version>2.8.8</caffeine.version>
+        <caffeine.version>3.0.3</caffeine.version>
         <classindex.version>3.8</classindex.version>
 
         <!-- ### Testing dependencies versions -->

diff --git a/internal/utils/cache/src/main/java/org/eclipse/ditto/internal/utils/cache/CaffeineCache.java b/internal/utils/cache/src/main/java/org/eclipse/ditto/internal/utils/cache/CaffeineCache.java
@@ -38,7 +38,7 @@
 public class CaffeineCache<K, V> implements Cache<K, V> {
 
     @Nullable private final MetricsStatsCounter metricStatsCounter;
-    private final BiFunction<? super K, Executor, CompletableFuture<V>> asyncLoad;
+    private final BiFunction<K, Executor, CompletableFuture<? extends V>> asyncLoad;
     private final AsyncCache<K, V> asyncCache;
     private final com.github.benmanes.caffeine.cache.Cache<K, V> synchronousCacheView;
 
@@ -54,11 +54,24 @@ private CaffeineCache(final Caffeine<? super K, ? super V> caffeine,
         } else {
             this.metricStatsCounter = null;
         }
-        asyncLoad = loader != null ? loader::asyncLoad : (k, e) -> CompletableFuture.completedFuture(null);
+        asyncLoad = getLoaderFunction(loader);
         this.asyncCache = loader != null ? caffeine.buildAsync(loader) : caffeine.buildAsync();
         this.synchronousCacheView = asyncCache.synchronous();
     }
 
+    private BiFunction<K, Executor, CompletableFuture<? extends V>> getLoaderFunction(
+            @Nullable final AsyncCacheLoader<K, V> loader) {
+        return loader != null ?
+                (k, e) -> {
+                    try {
+                        return loader.asyncLoad(k, e);
+                    } catch (final Exception ex) {
+                        return CompletableFuture.completedFuture(null);
+                    }
+                } :
+                (k, e) -> CompletableFuture.completedFuture(null);
+    }
+
     @SuppressWarnings({"squid:S2583", "ConstantConditions"})
     private Long getCurrentCacheSize() {
         if (synchronousCacheView == null) {

diff --git a/...utils/cache/src/main/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounter.java b/...utils/cache/src/main/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounter.java
@@ -20,6 +20,7 @@
 import org.eclipse.ditto.internal.utils.metrics.instruments.gauge.Gauge;
 import org.eclipse.ditto.internal.utils.metrics.instruments.timer.PreparedTimer;
 
+import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import com.github.benmanes.caffeine.cache.stats.StatsCounter;
 
@@ -112,7 +113,6 @@ public String toString() {
         }
     }
 
-    private static final int DEFAULT_EVICTION_WEIGHT = 1;
     private static final String CACHE_NAME_TAG = "cache_name";
 
     private final Counter hitCount;
@@ -143,7 +143,8 @@ private MetricsStatsCounter(final String cacheName, final Supplier<Long> maxSize
         estimatedInvalidations =
                 DittoMetrics.counter(MetricName.ESTIMATED_INVALIDATIONS.getValue()).tag(CACHE_NAME_TAG, cacheName);
         estimatedInvalidationsWithoutItem =
-                DittoMetrics.counter(MetricName.ESTIMATED_INVALIDATIONS_WITHOUT_ITEM.getValue()).tag(CACHE_NAME_TAG, cacheName);
+                DittoMetrics.counter(MetricName.ESTIMATED_INVALIDATIONS_WITHOUT_ITEM.getValue())
+                        .tag(CACHE_NAME_TAG, cacheName);
         this.maxSizeSupplier = maxSizeSupplier;
         this.estimatedSizeSupplier = estimatedSizeSupplier;
     }
@@ -185,13 +186,7 @@ public void recordLoadFailure(final long loadTimeInNanos) {
     }
 
     @Override
-    public void recordEviction() {
-        recordEviction(DEFAULT_EVICTION_WEIGHT);
-        updateCacheSizeMetrics();
-    }
-
-    @Override
-    public void recordEviction(final int weight) {
+    public void recordEviction(final int weight, final RemovalCause removalCause) {
         evictionCount.increment();
         evictionWeight.increment(weight);
         updateCacheSizeMetrics();
@@ -211,7 +206,7 @@ void recordInvalidationWithoutItem() {
 
     @Override
     public CacheStats snapshot() {
-        return new CacheStats(
+        return CacheStats.of(
                 hitCount.getCount(),
                 missCount.getCount(),
                 loadSuccessCount.getCount(),