fix(spring): improve null safety for cache get with loader (#309)

Author: iProdigy

spring-java17/src/main/java/io/github/xanthic/cache/springjdk17/XanthicSpringCache.java

@@ -31,24 +31,13 @@ public XanthicSpringCache(String name, Cache<Object, Object> cache) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T get(@NotNull Object key, @NotNull Callable<T> valueLoader) {
-		return (T) cache.computeIfAbsent(key, k -> getSynchronized(key, valueLoader));
-	}
-
-	@SuppressWarnings("unchecked")
-	private synchronized <T> T getSynchronized(Object key, Callable<T> valueLoader) {
-		ValueWrapper result = get(key);
-
-		if (result != null) {
-			return (T) result.get();
-		}
-
-		T value;
-		try {
-			value = valueLoader.call();
-		} catch (Exception e) {
-			throw new ValueRetrievalException(key, valueLoader, e);
-		}
-		return value;
+		return (T) fromStoreValue(cache.computeIfAbsent(key, k -> {
+			try {
+				return toStoreValue(valueLoader.call());
+			} catch (Exception e) {
+				throw new ValueRetrievalException(key, valueLoader, e);
+			}
+		}));
 	}
 
 	@Override

spring/src/main/java/io/github/xanthic/cache/spring/XanthicSpringCache.java

@@ -29,24 +29,13 @@ public XanthicSpringCache(String name, Cache<Object, Object> cache) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T get(@NotNull Object key, @NotNull Callable<T> valueLoader) {
-		return (T) cache.computeIfAbsent(key, k -> getSynchronized(key, valueLoader));
-	}
-
-	@SuppressWarnings("unchecked")
-	private synchronized <T> T getSynchronized(Object key, Callable<T> valueLoader) {
-		ValueWrapper result = get(key);
-
-		if (result != null) {
-			return (T) result.get();
-		}
-
-		T value;
-		try {
-			value = valueLoader.call();
-		} catch (Exception e) {
-			throw new ValueRetrievalException(key, valueLoader, e);
-		}
-		return value;
+		return (T) fromStoreValue(cache.computeIfAbsent(key, k -> {
+			try {
+				return toStoreValue(valueLoader.call());
+			} catch (Exception e) {
+				throw new ValueRetrievalException(key, valueLoader, e);
+			}
+		}));
 	}
 
 	@Override