chore(dependencies): Upgrade Spring Boot to 2.2.1

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel=true
 enablePublishing=false
-korkVersion=6.7.1
+korkVersion=7.0.0
 spinnakerGradleVersion=7.0.2

keiko-redis-spring/src/main/kotlin/com/netflix/spinnaker/config/RedisQueueConfiguration.kt

@@ -38,7 +38,7 @@ import redis.clients.jedis.Jedis
 import redis.clients.jedis.JedisCluster
 import redis.clients.jedis.JedisPool
 import redis.clients.jedis.Protocol
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 import java.net.URI
 import java.time.Clock
 import java.time.Duration

keiko-redis/build.gradle

@@ -2,9 +2,7 @@ apply from: "$rootDir/gradle/spek.gradle"
 
 dependencies {
   api project(":keiko-core")
-  api("redis.clients:jedis:2.10.2") {
-    force = true
-  }
+  api("redis.clients:jedis")
   api "com.fasterxml.jackson.core:jackson-databind"
   api "com.fasterxml.jackson.module:jackson-module-kotlin"
   api "org.funktionale:funktionale-partials"

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/AbstractRedisQueue.kt

@@ -10,8 +10,9 @@ import com.netflix.spinnaker.q.metrics.MonitorableQueue
 import com.netflix.spinnaker.q.migration.SerializationMigrator
 import org.slf4j.Logger
 import redis.clients.jedis.Jedis
-import redis.clients.jedis.JedisCommands
 import redis.clients.jedis.Transaction
+import redis.clients.jedis.commands.JedisClusterCommands
+import redis.clients.jedis.commands.JedisCommands
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
 import java.time.Clock
@@ -78,15 +79,27 @@ abstract class AbstractRedisQueue(
   internal fun JedisCommands.hgetInt(key: String, field: String, default: Int = 0) =
     hget(key, field)?.toInt() ?: default
 
+  internal fun JedisClusterCommands.hgetInt(key: String, field: String, default: Int = 0) =
+    hget(key, field)?.toInt() ?: default
+
   internal fun JedisCommands.zismember(key: String, member: String) =
     zrank(key, member) != null
 
+  internal fun JedisClusterCommands.zismember(key: String, member: String) =
+    zrank(key, member) != null
+
   internal fun JedisCommands.anyZismember(key: String, members: Set<String>) =
     members.any { zismember(key, it) }
 
+  internal fun JedisClusterCommands.anyZismember(key: String, members: Set<String>) =
+    members.any { zismember(key, it) }
+
   internal fun JedisCommands.firstFingerprint(key: String, fingerprint: Fingerprint) =
     fingerprint.all.firstOrNull { zismember(key, it) }
 
+  internal fun JedisClusterCommands.firstFingerprint(key: String, fingerprint: Fingerprint) =
+    fingerprint.all.firstOrNull { zismember(key, it) }
+
   @Deprecated("Hashes the attributes property, which is mutable")
   internal fun Message.hashV1() =
     Hashing

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/RedisClusterQueue.kt

@@ -31,8 +31,8 @@ import org.springframework.scheduling.annotation.Scheduled
 import redis.clients.jedis.JedisCluster
 import redis.clients.jedis.Transaction
 import redis.clients.jedis.exceptions.JedisDataException
-import redis.clients.jedis.params.sortedset.ZAddParams.zAddParams
-import redis.clients.util.JedisClusterCRC16
+import redis.clients.jedis.params.ZAddParams.zAddParams
+import redis.clients.jedis.util.JedisClusterCRC16
 import java.io.IOException
 import java.time.Clock
 import java.time.Duration
@@ -222,7 +222,7 @@ class RedisClusterQueue(
         found = result
           .map { mapper.readValue<Message>(it.value) }
           .any(predicate)
-        cursor = stringCursor
+        cursor = getCursor()
       }
       if (cursor == "0") break
     }

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/RedisDeadMessageHandler.kt

@@ -21,7 +21,7 @@ import com.netflix.spinnaker.q.DeadMessageCallback
 import com.netflix.spinnaker.q.Message
 import com.netflix.spinnaker.q.Queue
 import redis.clients.jedis.Jedis
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 import java.time.Clock
 
 /**

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/RedisQueue.kt

@@ -45,10 +45,10 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Scheduled
 import redis.clients.jedis.Jedis
-import redis.clients.jedis.ScriptingCommands
+import redis.clients.jedis.commands.ScriptingCommands
 import redis.clients.jedis.exceptions.JedisDataException
-import redis.clients.jedis.params.sortedset.ZAddParams.zAddParams
-import redis.clients.util.Pool
+import redis.clients.jedis.params.ZAddParams.zAddParams
+import redis.clients.jedis.util.Pool
 import java.io.IOException
 import java.time.Clock
 import java.time.Duration
@@ -253,7 +253,7 @@ class RedisQueue(
           found = result
             .map { mapper.readValue<Message>(it.value) }
             .any(predicate)
-          cursor = stringCursor
+          cursor = getCursor()
         }
         if (cursor == "0") break
       }