Migrate from older version of google collections to guava. Required migration from MapMaker to CacheBuilder. See: https://github.com/google/guava/wiki/MapMakerMigration

Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java

@@ -0,0 +1,58 @@
+package mage.client.util;
+
+import static com.google.common.cache.CacheBuilder.newBuilder;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
+import com.google.common.base.Function;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.ForwardingLoadingCache;
+import com.google.common.cache.LoadingCache;
+
+public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Optional<V>> {
+
+    private final LoadingCache<K, Optional<V>> cache;
+
+    public SoftValuesLoadingCache(CacheLoader<K, Optional<V>> loader) {
+        cache = newBuilder().softValues().build(loader);
+    }
+
+    @Override
+    protected LoadingCache<K, Optional<V>> delegate() {
+        return cache;
+    }
+
+    public V getOrThrow(K key) {
+        V v = getOrNull(key);
+        if (v == null) {
+            throw new NullPointerException();
+        }
+        return v;
+    }
+
+    public V getOrNull(K key) {
+        try {
+            return get(key).orElse(null);
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public V peekIfPresent(K key) {
+        Optional<V> value = getIfPresent(key);
+        if (value != null) {
+            return value.orElse(null);
+        }
+        return null;
+    }
+
+    public static <K, V> SoftValuesLoadingCache<K, V> from(CacheLoader<K, Optional<V>> loader) {
+        return new SoftValuesLoadingCache<>(loader);
+    }
+
+    public static <K, V> SoftValuesLoadingCache<K, V> from(Function<K, V> loader) {
+        return from(CacheLoader.from(k -> Optional.ofNullable(loader.apply(k))));
+    }
+
+}