Merge pull request #40 from SLNE-Development/fix/simple-redis-cache

Fix/Simple Redis Cache

Author: twisti-dev

gradle.properties

@@ -3,4 +3,4 @@ kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
 #org.gradle.caching=true
 #org.gradle.configureondemand=true
-version=1.21.11-1.4.3
+version=1.21.11-1.4.4

surf-redis-core/src/main/kotlin/dev/slne/surf/redis/cache/SimpleRedisCacheImpl.kt

@@ -233,12 +233,7 @@ class SimpleRedisCacheImpl<K : Any, V : Any>(
         }
 
         val bucket = api.redissonReactive.getBucket<String>(redisKey, StringCodec)
-        val raw = bucket.get().awaitSingleOrNull()
-
-        if (raw == null) {
-            nearCache.put(localKey, CacheEntry.Null)
-            return null
-        }
+        val raw = bucket.get().awaitSingleOrNull() ?: return null
 
         bucket.expire(ttl.toJavaDuration()).awaitSingleOrNull()
         refreshTtl(localKey, redisKey)
@@ -293,15 +288,38 @@ class SimpleRedisCacheImpl<K : Any, V : Any>(
         cacheNull: Boolean,
         loader: suspend () -> V?
     ): V? {
-        val existing = getCached(key)
-        if (existing != null) return existing
-        if (nearCache.getIfPresent(localKey(key)) == CacheEntry.Null) return null
+        val localKey = localKey(key)
+
+        when (val entry = nearCache.getIfPresent(localKey)) {
+            is CacheEntry.Value -> return entry.value
+            CacheEntry.Null -> return null
+            null -> Unit
+        }
+
+
+        val redisKey = redisKey(key)
+        val bucket = api.redissonReactive.getBucket<String>(redisKey, StringCodec)
+        val raw = bucket.get().awaitSingleOrNull()
+
+        if (raw != null) {
+            bucket.expire(ttl.toJavaDuration()).awaitSingleOrNull()
+            refreshTtl(localKey, redisKey)
+            return if (raw == NULL_MARKER) {
+                nearCache.put(localKey, CacheEntry.Null)
+                null
+            } else {
+                val value = api.json.decodeFromString(serializer, raw)
+                nearCache.put(localKey, CacheEntry.Value(value))
+                value
+            }
+        }
 
         val loaded = loader()
         when {
             loaded != null -> put(key, loaded)
             cacheNull -> putNull(key)
         }
+
         return loaded
     }