Address merge conflicts & tests (#25)

* Resolve merge conflicts and add end to end tests
orkes-io · Sep 14, 2023 · 20ca845 · 20ca845
1 parent a76c0ca
commit 20ca845
Show file tree

Hide file tree

Showing 37 changed files with 5,879 additions and 52 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,4 +15,4 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
       - name: Build
-        run: ./gradlew clean build
+        run: ./run_tests.sh
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ ext {
             revConductor            : '3.13.8',
             revTestContainer        : '1.17.2',
             revGuava                : '32.0.0-jre',
-            log4j                   : '2.17.1',
+            revLog4j                : '2.17.1',
             revJedis                : '3.8.0',
             revMockServerClient     : '5.12.0',
             revCommonsLang          : '3.12.0',
@@ -31,7 +31,8 @@ ext {
             revProtoBuf             : '3.16.3',
             revRarefiedRedis        : '0.0.17',
             revOrkesProtos          : '0.9.2',
-            revOrkesQueues          : '1.0.6'
+            revOrkesQueues          : '1.0.6',
+            ioGRPC                  : '1.53.0'
     ]
 }
 
@@ -85,12 +86,12 @@ subprojects {
         implementation 'com.amazonaws:aws-java-sdk-s3:1.12.548'
         implementation "redis.clients:jedis:${versions.revJedis}"
 
-        implementation "org.apache.logging.log4j:log4j-core:${versions.log4j}!!"
-        implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}!!"
-        implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}!!"
-        implementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}!!"
-        implementation "org.apache.logging.log4j:log4j-web:${versions.log4j}!!"
-        implementation "org.apache.logging.log4j:log4j-to-slf4j:${versions.log4j}!!"
+        implementation "org.apache.logging.log4j:log4j-core:${versions.revLog4j}!!"
+        implementation "org.apache.logging.log4j:log4j-api:${versions.revLog4j}!!"
+        implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.revLog4j}!!"
+        implementation "org.apache.logging.log4j:log4j-jul:${versions.revLog4j}!!"
+        implementation "org.apache.logging.log4j:log4j-web:${versions.revLog4j}!!"
+        implementation "org.apache.logging.log4j:log4j-to-slf4j:${versions.revLog4j}!!"
 
         compileOnly "org.projectlombok:lombok:${versions.revLombok}"
         annotationProcessor "org.projectlombok:lombok:${versions.revLombok}"

diff --git a/persistence/src/main/java/com/netflix/conductor/redis/config/InMemoryRedisConfiguration.java b/persistence/src/main/java/com/netflix/conductor/redis/config/InMemoryRedisConfiguration.java
@@ -64,4 +64,4 @@ public OrkesJedisProxy OrkesJedisProxy() {
         System.out.println("OrkesJedisProxy created");
         return new OrkesJedisProxy(jedisCommands());
     }
-}
+}
diff --git a/persistence/src/main/java/com/netflix/conductor/redis/jedis/JedisCluster.java b/persistence/src/main/java/com/netflix/conductor/redis/jedis/JedisCluster.java
@@ -22,25 +22,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
-import redis.clients.jedis.BitPosParams;
-import redis.clients.jedis.GeoCoordinate;
-import redis.clients.jedis.GeoRadiusResponse;
-import redis.clients.jedis.GeoUnit;
-import redis.clients.jedis.ListPosition;
-import redis.clients.jedis.ScanParams;
-import redis.clients.jedis.ScanResult;
-import redis.clients.jedis.SortingParams;
-import redis.clients.jedis.StreamConsumersInfo;
-import redis.clients.jedis.StreamEntry;
-import redis.clients.jedis.StreamEntryID;
-import redis.clients.jedis.StreamGroupInfo;
-import redis.clients.jedis.StreamInfo;
-import redis.clients.jedis.StreamPendingEntry;
-import redis.clients.jedis.Tuple;
-import redis.clients.jedis.params.GeoRadiusParam;
-import redis.clients.jedis.params.SetParams;
-import redis.clients.jedis.params.ZAddParams;
-import redis.clients.jedis.params.ZIncrByParams;
+import redis.clients.jedis.*;
+import redis.clients.jedis.params.*;
+import redis.clients.jedis.resps.KeyedListElement;
+import redis.clients.jedis.resps.LCSMatchResult;
 
 @Component
 @ConditionalOnProperty(name = "conductor.db.type", havingValue = "redis_cluster")
@@ -964,4 +949,206 @@ public String set(byte[] key, byte[] value) {
     public byte[] getBytes(byte[] key) {
         return jedisCluster.get(key);
     }
-}
+
+    //
+
+    @Override
+    public String getDel(String key) {
+        return jedisCluster.getDel(key);
+    }
+
+    @Override
+    public String getEx(String key, GetExParams params) {
+        return jedisCluster.getEx(key, params);
+    }
+
+    @Override
+    public String restore(String key, long ttl, byte[] serializedValue) {
+        return jedisCluster.restore(key, ttl, serializedValue);
+    }
+
+    @Override
+    public String restoreReplace(String key, long ttl, byte[] serializedValue) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String restore(String key, long ttl, byte[] serializedValue, RestoreParams params) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Long expire(String key, long seconds) {
+        return jedisCluster.expire(key, seconds);
+    }
+
+    @Override
+    public String setex(String key, long seconds, String value) {
+        return jedisCluster.setex(key, seconds, value);
+    }
+
+    @Override
+    public String hrandfield(String key) {
+        return jedisCluster.hrandfield(key);
+    }
+
+    @Override
+    public List<String> hrandfield(String key, long count) {
+        return jedisCluster.hrandfield(key, count);
+    }
+
+    @Override
+    public Map<String, String> hrandfieldWithValues(String key, long count) {
+        return null;
+    }
+
+    @Override
+    public List<String> lpop(String key, int count) {
+        return null;
+    }
+
+    @Override
+    public Long lpos(String key, String element) {
+        return null;
+    }
+
+    @Override
+    public Long lpos(String key, String element, LPosParams params) {
+        return null;
+    }
+
+    @Override
+    public List<Long> lpos(String key, String element, LPosParams params, long count) {
+        return null;
+    }
+
+    @Override
+    public List<String> rpop(String key, int count) {
+        return null;
+    }
+
+    @Override
+    public List<Boolean> smismember(String key, String... members) {
+        return null;
+    }
+
+    @Override
+    public Double zaddIncr(String key, double score, String member, ZAddParams params) {
+        return null;
+    }
+
+    @Override
+    public String zrandmember(String key) {
+        return null;
+    }
+
+    @Override
+    public Set<String> zrandmember(String key, long count) {
+        return null;
+    }
+
+    @Override
+    public Set<Tuple> zrandmemberWithScores(String key, long count) {
+        return null;
+    }
+
+    @Override
+    public List<Double> zmscore(String key, String... members) {
+        return null;
+    }
+
+    @Override
+    public KeyedListElement blpop(double timeout, String key) {
+        return null;
+    }
+
+    @Override
+    public KeyedListElement brpop(double timeout, String key) {
+        return null;
+    }
+
+    @Override
+    public Long geoadd(
+            String key, GeoAddParams params, Map<String, GeoCoordinate> memberCoordinateMap) {
+        return null;
+    }
+
+    @Override
+    public StreamEntryID xadd(String key, Map<String, String> hash, XAddParams params) {
+        return null;
+    }
+
+    @Override
+    public List<StreamEntry> xrange(String key, StreamEntryID start, StreamEntryID end) {
+        return null;
+    }
+
+    @Override
+    public List<StreamEntry> xrevrange(String key, StreamEntryID end, StreamEntryID start) {
+        return null;
+    }
+
+    @Override
+    public StreamPendingSummary xpending(String key, String groupname) {
+        return null;
+    }
+
+    @Override
+    public List<StreamPendingEntry> xpending(String key, String groupname, XPendingParams params) {
+        return null;
+    }
+
+    @Override
+    public long xtrim(String key, XTrimParams params) {
+        return 0;
+    }
+
+    @Override
+    public List<StreamEntry> xclaim(
+            String key,
+            String group,
+            String consumername,
+            long minIdleTime,
+            XClaimParams params,
+            StreamEntryID... ids) {
+        return null;
+    }
+
+    @Override
+    public List<StreamEntryID> xclaimJustId(
+            String key,
+            String group,
+            String consumername,
+            long minIdleTime,
+            XClaimParams params,
+            StreamEntryID... ids) {
+        return null;
+    }
+
+    @Override
+    public Entry<StreamEntryID, List<StreamEntry>> xautoclaim(
+            String key,
+            String group,
+            String consumerName,
+            long minIdleTime,
+            StreamEntryID start,
+            XAutoClaimParams params) {
+        return null;
+    }
+
+    @Override
+    public Entry<StreamEntryID, List<StreamEntryID>> xautoclaimJustId(
+            String key,
+            String group,
+            String consumerName,
+            long minIdleTime,
+            StreamEntryID start,
+            XAutoClaimParams params) {
+        return null;
+    }
+
+    @Override
+    public LCSMatchResult strAlgoLCSStrings(String strA, String strB, StrAlgoLCSParams params) {
+        return null;
+    }
+}