chore: deprecate AbstractCache that relies upon synchronization

core/src/main/java/io/github/xanthic/cache/core/AbstractCache.java

@@ -1,6 +1,7 @@
 package io.github.xanthic.cache.core;
 
 import io.github.xanthic.cache.api.Cache;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,7 +25,10 @@
  *
  * @param <K> The type of keys that form the cache
  * @param <V> The type of values contained in the cache
+ * @deprecated no longer used by Xanthic; synchronization generally should be avoided
  */
+@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "1.0.0")
 public abstract class AbstractCache<K, V> implements Cache<K, V> {
 
 	@Override

core/src/main/java/io/github/xanthic/cache/core/LockedAbstractCache.java

@@ -1,6 +1,7 @@
 package io.github.xanthic.cache.core;
 
 import io.github.xanthic.cache.api.Cache;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,6 +31,7 @@
  * @deprecated no longer used by Xanthic to implement any canonical cache provider
  */
 @Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "1.0.0")
 public abstract class LockedAbstractCache<K, V> implements Cache<K, V> {
 
 	protected final ReadWriteLock lock = new ReentrantReadWriteLock();

provider-androidx/src/main/java/io/github/xanthic/cache/provider/androidx/AbstractCache.java

@@ -0,0 +1,107 @@
+package io.github.xanthic.cache.provider.androidx;
+
+import io.github.xanthic.cache.api.Cache;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+abstract class AbstractCache<K, V> implements Cache<K, V> {
+
+	@Override
+	public V computeIfAbsent(@NotNull K key, @NotNull Function<K, V> computeFunc) {
+		synchronized (getLock()) {
+			V old = this.get(key);
+			if (old != null) return old;
+			V computed = computeFunc.apply(key);
+			this.put(key, computed);
+			return computed;
+		}
+	}
+
+	@Nullable
+	@Override
+	public V compute(@NotNull K key, @NotNull BiFunction<? super K, ? super V, ? extends V> computeFunc) {
+		synchronized (getLock()) {
+			V oldValue = this.get(key);
+			V newValue = computeFunc.apply(key, oldValue);
+			if (newValue != null) {
+				this.put(key, newValue);
+				return newValue;
+			} else if (oldValue != null) {
+				this.remove(key);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public V computeIfPresent(@NotNull K key, @NotNull BiFunction<? super K, ? super V, ? extends V> computeFunc) {
+		synchronized (getLock()) {
+			V oldValue = this.get(key);
+			if (oldValue != null) {
+				V newValue = computeFunc.apply(key, oldValue);
+				if (newValue != null) {
+					this.put(key, newValue);
+					return newValue;
+				} else {
+					this.remove(key);
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public V putIfAbsent(@NotNull K key, @NotNull V value) {
+		synchronized (getLock()) {
+			V old = this.get(key);
+			if (old == null) {
+				this.put(key, value);
+			}
+			return old;
+		}
+	}
+
+	@Override
+	public V merge(@NotNull K key, @NotNull V value, @NotNull BiFunction<V, V, V> mergeFunc) {
+		synchronized (getLock()) {
+			V old = putIfAbsent(key, value);
+			if (old == null) return value;
+			V merged = mergeFunc.apply(old, value);
+			this.put(key, merged);
+			return merged;
+		}
+	}
+
+	@Override
+	public boolean replace(@NotNull K key, @NotNull V value) {
+		synchronized (getLock()) {
+			V old = this.get(key);
+			if (old == null) return false;
+			put(key, value);
+			return true;
+		}
+	}
+
+	@Override
+	public boolean replace(@NotNull K key, @NotNull V oldValue, @NotNull V newValue) {
+		// noinspection ConstantConditions
+		if (oldValue == null) return false;
+		synchronized (getLock()) {
+			if (Objects.equals(oldValue, this.get(key))) {
+				this.put(key, newValue);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@NotNull
+	protected Object getLock() {
+		return this;
+	}
+
+}

provider-androidx/src/main/java/io/github/xanthic/cache/provider/androidx/ExpiringLruDelegate.java

@@ -4,7 +4,6 @@
 import io.github.xanthic.cache.api.RemovalListener;
 import io.github.xanthic.cache.api.domain.ExpiryType;
 import io.github.xanthic.cache.api.domain.RemovalCause;
-import io.github.xanthic.cache.core.AbstractCache;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

provider-androidx/src/main/java/io/github/xanthic/cache/provider/androidx/LruDelegate.java

@@ -1,7 +1,6 @@
 package io.github.xanthic.cache.provider.androidx;
 
 import androidx.collection.LruCache;
-import io.github.xanthic.cache.core.AbstractCache;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;