amends to use valkey-java 5.4.0

Author: oscar-besga-panel

build.gradle

@@ -34,7 +34,7 @@ dependencies {
             testImplementation group: 'org.mockito', name: 'mockito-inline', version: "${mockitoVersion}"
      */
 
-    // sadly doesnt work => testImplementation 'com.github.fppt:jedis-mock:0.1.14'
+    // sadly doesn't work => testImplementation 'com.github.fppt:jedis-mock:0.1.14'
 }
 
 jacocoTestReport {

gradle.properties

@@ -1,12 +1,12 @@
-projectVersion=6.3.0
+projectVersion=6.5.0
 #javaVersion=JavaVersion.VERSION_11
 javaVersion=11
 
 # https://github.com/johnrengelman/shadow
 shadowVersion=7.1.2
 
 # https://central.sonatype.com/artifact/io.valkey/valkey-java
-valkeyJavaVersion=5.3.0
+valkeyJavaVersion=5.4.0
 # https://mvnrepository.com/artifact/org.javassist/javassist
 javassistVersion=3.30.1-GA
 # https://mvnrepository.com/artifact/org.slf4j/slf4j-api

src/test/java/org/oba/jedis/extra/utils/test/TestingUtils.java

@@ -4,14 +4,16 @@
 import io.valkey.params.SetParams;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TestingUtils {
 
     private TestingUtils() {}
 
     public static boolean isSetParamsNX(SetParams setParams) {
         if (setParams != null) {
-            Protocol.Keyword valueExistance = extractPrivateValue("existance", SetParams.class, setParams, Protocol.Keyword.class);
+            Protocol.Keyword valueExistance = extractPrivateValue("existence", SetParams.class, setParams, Protocol.Keyword.class);
             return valueExistance == Protocol.Keyword.NX;
         } else {
             return false;
@@ -22,8 +24,8 @@ public static boolean isSetParamsNX(SetParams setParams) {
 
     public static Long extractSetParamsExpireTimePX(SetParams setParams) {
         if (setParams != null) {
-            Protocol.Keyword valueExpiration = extractPrivateValue("expiration", SetParams.class, setParams, Protocol.Keyword.class);
-            Long valueExpirationValue = extractPrivateValue("expirationValue", SetParams.class, setParams, Long.class);
+            Protocol.Keyword valueExpiration = extractPrivateValue("expiration", SetParams.class, setParams, Protocol.Keyword.class, true);
+            Long valueExpirationValue = extractPrivateValue("expirationValue", SetParams.class, setParams, Long.class, true);
             if (valueExpiration == null && valueExpirationValue == null) {
                 return null;
             } else if (valueExpiration == Protocol.Keyword.PX) {
@@ -39,8 +41,17 @@ public static Long extractSetParamsExpireTimePX(SetParams setParams) {
 
 
     public static <I,O> O extractPrivateValue(String field, Class<I> originType, I origin, Class<O> resultType) {
+        return extractPrivateValue(field, originType, origin, resultType, false);
+    }
+
+    public static <I,O> O extractPrivateValue(String field, Class<I> originType, I origin, Class<O> resultType, boolean searchInParent) {
         try {
-            Field privateField = origin.getClass().getDeclaredField(field);
+            Field privateField;
+            if (searchInParent) {
+                privateField = getPrivateFieldsFromObjectAndParent(originType, field);
+            } else {
+                privateField = origin.getClass().getDeclaredField(field);
+            }
             privateField.setAccessible(true);
             if (resultType == privateField.getType()){
                 return (O) privateField.get(origin);
@@ -56,4 +67,21 @@ public static <I,O> O extractPrivateValue(String field, Class<I> originType, I o
         }
     }
 
-}
+    public static Field getPrivateFieldsFromObjectAndParent(Class<?> type, String name) {
+        List<Field> fieldList = new ArrayList<>();
+        Class<?> currentType = type;
+        while (currentType != null && currentType != Object.class) {
+            for (Field field : currentType.getDeclaredFields()) {
+                if (!field.isSynthetic()) {
+                    fieldList.add(field);
+                }
+            }
+            currentType = currentType.getSuperclass();
+        }
+        return fieldList.stream().
+                filter(f -> f.getName().equals(name)).
+                findFirst().get();
+
+    }
+
+}