[deps] Upgraded to LettuceMod 1.7.3

Author: jruaux

.github/workflows/build.yml

@@ -13,9 +13,10 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
+          distribution: 'zulu'
 
       - uses: actions/cache@v2
         with:

.github/workflows/early-access.yml

@@ -16,9 +16,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
+          distribution: 'zulu'
 
       - uses: actions/cache@v2
         with:

.github/workflows/release.yml

@@ -16,9 +16,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
+          distribution: 'zulu'
 
       - uses: actions/cache@v2
         with:

gradle.properties

@@ -6,5 +6,5 @@ kordampPluginVersion=0.46.0
 lombokPluginVersion=6.0.0-m2
 junitVersion=5.7.2
 lettucemodVersion=1.7.3
-slf4jVersion=1.7.30
+slf4jVersion=1.7.32
 testcontainersVersion=1.15.3

subprojects/testcontainers-redis/src/test/java/com/redis/testcontainers/TestRedisEnterprise.java

@@ -1,12 +1,12 @@
 package com.redis.testcontainers;
 
 import com.redis.lettucemod.RedisModulesClient;
+import com.redis.lettucemod.Utils;
 import com.redis.lettucemod.api.StatefulRedisModulesConnection;
+import com.redis.lettucemod.api.search.Field;
+import com.redis.lettucemod.api.search.SearchResults;
 import com.redis.lettucemod.cluster.RedisModulesClusterClient;
 import com.redis.lettucemod.cluster.api.StatefulRedisModulesClusterConnection;
-import com.redis.lettucemod.gears.RedisGearsUtils;
-import com.redis.lettucemod.search.Field;
-import com.redis.lettucemod.search.SearchResults;
 import com.redis.testcontainers.support.enterprise.rest.Database;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -95,7 +95,7 @@ void gears() {
             RedisModulesClient client = RedisModulesClient.create(container.getRedisURI());
             try (StatefulRedisModulesConnection<String, String> connection = client.connect()) {
                 connection.sync().set("foo", "bar");
-                connection.sync().pyExecute(load("sleep.py"));
+                connection.sync().pyexecute(load("sleep.py"));
             }
         } finally {
             container.stop();
@@ -104,7 +104,7 @@ void gears() {
 
     @SuppressWarnings("ConstantConditions")
     private String load(String resourceName) {
-        return RedisGearsUtils.toString(getClass().getClassLoader().getResourceAsStream(resourceName));
+        return Utils.toString(getClass().getClassLoader().getResourceAsStream(resourceName));
     }
 
 }

subprojects/testcontainers-redis/src/test/java/com/redis/testcontainers/TestRedisModules.java

@@ -3,17 +3,19 @@
 import com.redis.lettucemod.RedisModulesClient;
 import com.redis.lettucemod.api.StatefulRedisModulesConnection;
 import com.redis.lettucemod.api.sync.RedisTimeSeriesCommands;
-import com.redis.lettucemod.gears.output.ExecutionResults;
-import com.redis.lettucemod.timeseries.CreateOptions;
-import com.redis.lettucemod.timeseries.Label;
-import org.junit.jupiter.api.*;
+import com.redis.lettucemod.api.timeseries.CreateOptions;
+import com.redis.lettucemod.output.ExecutionResults;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@SuppressWarnings("unchecked")
 @Testcontainers
 public class TestRedisModules {
 
@@ -57,14 +59,14 @@ void canPing() {
 
     @Test
     void canExecuteRedisGearsFunction() {
-        ExecutionResults results = connection.sync().pyExecute("GB().run()");
+        ExecutionResults results = connection.sync().pyexecute("GB().run()");
         Assertions.assertTrue(results.isOk());
     }
 
     @Test
     void canWriteToRedisTimeSeries() {
         RedisTimeSeriesCommands<String, String> ts = connection.sync();
-        ts.create("temperature:3:11", CreateOptions.builder().retentionTime(6000).build(), Label.of("sensor_id", "2"), Label.of("area_id", "32"));
+        ts.create("temperature:3:11", CreateOptions.<String, String>builder().retentionTime(6000).label("sensor_id", "2").label("area_id", "32").build());
         // TS.ADD temperature:3:11 1548149181 30
         Long add1 = ts.add("temperature:3:11", 1548149181, 30);
         Assertions.assertEquals(1548149181, add1);