dependencies: upgrade Jedis to v4.4.0

Author: bsbodden

redis-om-spring/pom.xml

@@ -61,7 +61,7 @@
     <java.version>17</java.version>
     <spring.version>3.1.1</spring.version>
     <sdr.version>3.1.1</sdr.version>
-    <jedis.version>4.3.2</jedis.version>
+    <jedis.version>4.4.0</jedis.version>
     <cdi>1.0</cdi>
     <auto-service.version>1.0.1</auto-service.version>
     <spring.test.version>6.0.9</spring.test.version>

redis-om-spring/src/main/java/com/redis/om/spring/repository/query/RediSearchQuery.java

@@ -564,7 +564,7 @@ private Object executeAggregation(Object[] parameters) {
       if (queryMethod.getReturnedObjectType() == Map.class) {
         content = aggregationResult.getResults().stream().map(m -> m.entrySet().stream() //
             .map(e -> new AbstractMap.SimpleEntry<>(e.getKey(),
-                e.getValue() != null ? new String((byte[]) e.getValue()) : "")) //
+                e.getValue() != null ? e.getValue().toString() : "")) //
             .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)) //
         ).collect(Collectors.toList());
       }

redis-om-spring/src/main/java/com/redis/om/spring/repository/query/RedisEnhancedQuery.java

@@ -547,7 +547,7 @@ private Object executeAggregation(Object[] parameters) {
       if (queryMethod.getReturnedObjectType() == Map.class) {
         content = aggregationResult.getResults().stream().map(m -> m.entrySet().stream() //
             .map(e -> new AbstractMap.SimpleEntry<>(e.getKey(),
-                e.getValue() != null ? new String((byte[]) e.getValue()) : "")) //
+                e.getValue() != null ? e.getValue().toString() : "")) //
             .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)) //
         ).collect(Collectors.toList());
       }

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/AggregationPage.java

@@ -147,7 +147,7 @@ protected <U> List<U> getConvertedContent(Function<? super E, ? extends U> conve
 
   List<E> toEntityList(AggregationResult aggregationResult) {
     if (isDocument) {
-      return aggregationResult.getResults().stream().map(d -> gson.fromJson(SafeEncoder.encode((byte[])d.get("$")), entityClass)).toList();
+      return aggregationResult.getResults().stream().map(d -> gson.fromJson(d.get("$").toString(), entityClass)).toList();
     } else {
       return aggregationResult.getResults().stream().map(h -> (E) ObjectUtils.mapToObject(h, entityClass, mappingConverter)).toList();
     }

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/AggregationStreamImpl.java

@@ -349,28 +349,28 @@ public <R extends T> List<R> toList(Class<?>... contentTypes) {
       for (int i = 0; i < labels.length; i++) {
         Object raw = m.get(labels[i]);
         if (contentTypes[i] == String.class) {
-          mappedValues.add(raw != null ? new String((byte[]) raw) : "");
+          mappedValues.add(raw != null ? raw : "");
         } else if (contentTypes[i] == Long.class) {
-          mappedValues.add(raw != null ? Long.parseLong(new String((byte[]) raw)) : 0L);
+          mappedValues.add(raw != null ? Long.parseLong(raw.toString()) : 0L);
         } else if (contentTypes[i] == Integer.class) {
-          mappedValues.add(raw != null ? Integer.parseInt(new String((byte[]) raw)) : 0);
+          mappedValues.add(raw != null ? Integer.parseInt(raw.toString()) : 0);
         } else if (contentTypes[i] == Double.class) {
-          mappedValues.add(raw != null ? Double.parseDouble(new String((byte[]) raw)) : 0);
+          mappedValues.add(raw != null ? Double.parseDouble(raw.toString()) : 0);
         } else if (contentTypes[i] == List.class && List.class.isAssignableFrom(raw.getClass())) {
           Class<?> listContents = returnFieldsTypeHints.get(labels[i]);
           List<?> rawList = (List<?>) raw;
           if (listContents != null) {
             if (listContents == String.class) {
-              mappedValues.add(rawList.stream().map(e -> e != null ? new String((byte[]) e) : "").toList());
+              mappedValues.add(rawList.stream().map(e -> e != null ? e : "").toList());
             } else if (listContents == Long.class) {
               mappedValues.add(
-                  rawList.stream().map(e -> e != null ? Long.parseLong(new String((byte[]) e)) : 0L).toList());
+                  rawList.stream().map(e -> e != null ? Long.parseLong(e.toString()) : 0L).toList());
             } else if (listContents == Integer.class) {
               mappedValues.add(
-                  rawList.stream().map(e -> e != null ? Integer.parseInt(new String((byte[]) e)) : 0).toList());
+                  rawList.stream().map(e -> e != null ? Integer.parseInt(e.toString()) : 0).toList());
             } else if (listContents == Double.class) {
               mappedValues.add(
-                  rawList.stream().map(e -> e != null ? Double.parseDouble(new String((byte[]) e)) : 0).toList());
+                  rawList.stream().map(e -> e != null ? Double.parseDouble(e.toString()) : 0).toList());
             } else {
               mappedValues.add(rawList);
             }
@@ -497,7 +497,7 @@ private Class<?> getTypeHintForReducer(Reducer cr, MetamodelField<?, ?> field) {
   List<E> toEntityList(AggregationResult aggregationResult) {
     if (isDocument) {
       return aggregationResult.getResults().stream()
-          .map(d -> gson.fromJson(SafeEncoder.encode((byte[]) d.get("$")), entityClass)).toList();
+          .map(d -> gson.fromJson(d.get("$").toString(), entityClass)).toList();
     } else {
       return aggregationResult.getResults().stream().map(h -> (E) ObjectUtils.mapToObject(h, entityClass, mappingConverter)).toList();
     }

redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java

@@ -287,7 +287,7 @@ public static Object documentToObject(Document document, Class<?> returnedObject
   public static Object mapToObject(Map<String,Object> properties, Class<?> returnedObjectType,
       MappingRedisOMConverter mappingConverter) {
     Bucket b = new Bucket();
-    properties.forEach((k,v) -> b.put(k, (byte[]) v));
+    properties.forEach((k,v) -> b.put(k, v.toString().getBytes()));
 
     return mappingConverter.read(returnedObjectType, new RedisData(b));
   }

redis-om-spring/src/test/java/com/redis/om/spring/annotations/hash/BasicRedisHashMappingTest.java

@@ -143,7 +143,7 @@ void testByTags() {
   void testAggregationAnnotation01() {
     AggregationResult results = personRepo.allNamesInUppercase();
     List<String> upcasedNames = results.getResults().stream().map(m -> m.get("upcasedName"))
-        .map(o -> new String((byte[]) o)).collect(Collectors.toList());
+        .map(Object::toString).toList();
     assertThat(upcasedNames).containsExactlyInAnyOrder("JOHN CLEESE", //
         "GRAHAM CHAPMAN", //
         "TERRY GILLIAM", //