Drop fallback from Redis unlink to delete

Remove code remainings

Signed-off-by: Michal Domagala <[email protected]>

Author: michaldo

spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java

@@ -434,11 +434,6 @@ protected abstract boolean tryRedisLockInner(long time, long expireAfter)
 		 */
 		protected abstract boolean removeLockKeyInnerUnlink();
 
-		/**
-		 * Unlock the lock using the delete method in redis.
-		 */
-		protected abstract boolean removeLockKeyInnerDelete();
-
 		@Override
 		public final void lock() {
 			this.lock(RedisLockRegistry.this.expireAfter);
@@ -583,7 +578,7 @@ public final void unlock() {
 		private void removeLockKey() {
 			boolean unlinkResult = removeLockKeyInnerUnlink();
 			if (unlinkResult) {
-				// Lock key successfully unlinked
+				// Lock key successfully removed
 				stopRenew();
 			} else  {
 				throw new ConcurrentModificationException("Lock was released in the store due to expiration. " +
@@ -676,21 +671,9 @@ private final class RedisPubSubLock extends RedisLock {
 				return false
 				""";
 
-		private static final String DELETE_UNLOCK_SCRIPT = """
-				local lockClientId = redis.call('GET', KEYS[1])
-				if (lockClientId == ARGV[1] and redis.call('DEL', KEYS[1]) == 1) then
-					redis.call('PUBLISH', ARGV[2], KEYS[1])
-					return true
-				end
-				return false
-				""";
-
 		private static final RedisScript<Boolean>
 				UNLINK_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(UNLINK_UNLOCK_SCRIPT, Boolean.class);
 
-		private static final RedisScript<Boolean>
-				DELETE_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(DELETE_UNLOCK_SCRIPT, Boolean.class);
-
 		private RedisPubSubLock(String path) {
 			super(path);
 		}
@@ -703,17 +686,8 @@ protected boolean tryRedisLockInner(long time, long expireAfter)
 
 		@Override
 		protected boolean removeLockKeyInnerUnlink() {
-			return removeLockKeyWithScript(UNLINK_UNLOCK_REDIS_SCRIPT);
-		}
-
-		@Override
-		protected boolean removeLockKeyInnerDelete() {
-			return removeLockKeyWithScript(DELETE_UNLOCK_REDIS_SCRIPT);
-		}
-
-		private boolean removeLockKeyWithScript(RedisScript<Boolean> redisScript) {
 			return Boolean.TRUE.equals(RedisLockRegistry.this.redisTemplate.execute(
-					redisScript, Collections.singletonList(this.lockKey),
+					UNLINK_UNLOCK_REDIS_SCRIPT, Collections.singletonList(this.lockKey),
 					RedisLockRegistry.this.clientId, RedisLockRegistry.this.unLockChannelKey));
 		}
 
@@ -825,20 +799,9 @@ private final class RedisSpinLock extends RedisLock {
 				return false
 				""";
 
-		private static final String DELETE_UNLOCK_SCRIPT = """
-				local lockClientId = redis.call('GET', KEYS[1])
-				if lockClientId == ARGV[1] then
-					redis.call('DEL', KEYS[1])
-					return true
-				end
-				return false
-				""";
-
 		private static final RedisScript<Boolean>
 				UNLINK_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(UNLINK_UNLOCK_SCRIPT, Boolean.class);
 
-		private static final RedisScript<Boolean>
-				DELETE_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(DELETE_UNLOCK_SCRIPT, Boolean.class);
 
 		private RedisSpinLock(String path) {
 			super(path);
@@ -865,17 +828,8 @@ protected boolean tryRedisLockInner(long time, long expireAfter) throws Interrup
 
 		@Override
 		protected boolean removeLockKeyInnerUnlink() {
-			return removeLockKeyWithScript(UNLINK_UNLOCK_REDIS_SCRIPT);
-		}
-
-		@Override
-		protected boolean removeLockKeyInnerDelete() {
-			return removeLockKeyWithScript(DELETE_UNLOCK_REDIS_SCRIPT);
-		}
-
-		private boolean removeLockKeyWithScript(RedisScript<Boolean> redisScript) {
 			return Boolean.TRUE.equals(RedisLockRegistry.this.redisTemplate.execute(
-					redisScript, Collections.singletonList(this.lockKey),
+					UNLINK_UNLOCK_REDIS_SCRIPT, Collections.singletonList(this.lockKey),
 					RedisLockRegistry.this.clientId));
 		}