Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RedisLockRegistry for Java 8 compatibility

Browse Source
This commit is contained in:
Artem Bilan
2022-06-08 13:44:44 -04:00
parent cce90eaef6
commit 32960fa98c
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
/** /**
* It is set via lazy initialization when it is a {@link RedisLockType#PUB_SUB_LOCK}. * It is set via lazy initialization when it is a {@link RedisLockType#PUB_SUB_LOCK}.
*/ */
private volatile RedisPubSubLock.RedisUnLockNotifyMessageListener unlockNotifyMessageListener; private volatile RedisUnLockNotifyMessageListener unlockNotifyMessageListener;
/** /**
* It is set via lazy initialization when it is a {@link RedisLockType#PUB_SUB_LOCK}. * It is set via lazy initialization when it is a {@link RedisLockType#PUB_SUB_LOCK}.
@@ -174,7 +174,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
Assert.isNull(RedisLockRegistry.this.unlockNotifyMessageListener, Assert.isNull(RedisLockRegistry.this.unlockNotifyMessageListener,
"'unlockNotifyMessageListener' must not have been re-initialized."); "'unlockNotifyMessageListener' must not have been re-initialized.");
RedisLockRegistry.this.redisMessageListenerContainer = new RedisMessageListenerContainer(); RedisLockRegistry.this.redisMessageListenerContainer = new RedisMessageListenerContainer();
RedisLockRegistry.this.unlockNotifyMessageListener = new RedisPubSubLock.RedisUnLockNotifyMessageListener(); RedisLockRegistry.this.unlockNotifyMessageListener = new RedisUnLockNotifyMessageListener();
final Topic topic = new ChannelTopic(this.unLockChannelKey); final Topic topic = new ChannelTopic(this.unLockChannelKey);
this.redisMessageListenerContainer.setConnectionFactory(connectionFactory); this.redisMessageListenerContainer.setConnectionFactory(connectionFactory);
this.redisMessageListenerContainer.setTaskExecutor(this.executor); this.redisMessageListenerContainer.setTaskExecutor(this.executor);
@@ -293,8 +293,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
"end " + "end " +
"return false"; "return false";
protected static final RedisScript<Boolean> private final RedisScript<Boolean> obtainLockRedisScript =
OBTAIN_LOCK_REDIS_SCRIPT = new DefaultRedisScript<>(OBTAIN_LOCK_SCRIPT, Boolean.class); new DefaultRedisScript<>(OBTAIN_LOCK_SCRIPT, Boolean.class);
protected final String lockKey; protected final String lockKey;
@@ -422,7 +422,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
protected final Boolean obtainLock() { protected final Boolean obtainLock() {
return RedisLockRegistry.this.redisTemplate return RedisLockRegistry.this.redisTemplate
.execute(OBTAIN_LOCK_REDIS_SCRIPT, Collections.singletonList(this.lockKey), .execute(this.obtainLockRedisScript, Collections.singletonList(this.lockKey),
RedisLockRegistry.this.clientId, RedisLockRegistry.this.clientId,
String.valueOf(RedisLockRegistry.this.expireAfter)); String.valueOf(RedisLockRegistry.this.expireAfter));
} }
@@ -556,11 +556,11 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
"end " + "end " +
"return false"; "return false";
private static final RedisScript<Boolean> private final RedisScript<Boolean> unlinkUnlockRedisScript =
UNLINK_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(UNLINK_UNLOCK_SCRIPT, Boolean.class); new DefaultRedisScript<>(UNLINK_UNLOCK_SCRIPT, Boolean.class);
private static final RedisScript<Boolean> private final RedisScript<Boolean> deleteUnlockRedisScript =
DELETE_UNLOCK_REDIS_SCRIPT = new DefaultRedisScript<>(DELETE_UNLOCK_SCRIPT, Boolean.class); new DefaultRedisScript<>(DELETE_UNLOCK_SCRIPT, Boolean.class);
private RedisPubSubLock(String path) { private RedisPubSubLock(String path) {
super(path); super(path);
@@ -574,14 +574,14 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
@Override @Override
protected void removeLockKeyInnerUnlink() { protected void removeLockKeyInnerUnlink() {
RedisLockRegistry.this.redisTemplate.execute( RedisLockRegistry.this.redisTemplate.execute(
UNLINK_UNLOCK_REDIS_SCRIPT, Collections.singletonList(this.lockKey), this.unlinkUnlockRedisScript, Collections.singletonList(this.lockKey),
RedisLockRegistry.this.unLockChannelKey); RedisLockRegistry.this.unLockChannelKey);
} }
@Override @Override
protected void removeLockKeyInnerDelete() { protected void removeLockKeyInnerDelete() {
RedisLockRegistry.this.redisTemplate.execute( RedisLockRegistry.this.redisTemplate.execute(
DELETE_UNLOCK_REDIS_SCRIPT, Collections.singletonList(this.lockKey), this.deleteUnlockRedisScript, Collections.singletonList(this.lockKey),
RedisLockRegistry.this.unLockChannelKey); RedisLockRegistry.this.unLockChannelKey);
} }
@@ -641,31 +641,31 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
} }
} }
private static final class RedisUnLockNotifyMessageListener implements MessageListener { }
private final Map<String, SettableListenableFuture<String>> notifyMap = new ConcurrentHashMap<>(); private static final class RedisUnLockNotifyMessageListener implements MessageListener {
@Override private final Map<String, SettableListenableFuture<String>> notifyMap = new ConcurrentHashMap<>();
public void onMessage(Message message, byte[] pattern) {
final String lockKey = new String(message.getBody());
unlockNotify(lockKey);
}
public Future<String> subscribeLock(String lockKey) { @Override
return this.notifyMap.computeIfAbsent(lockKey, key -> new SettableListenableFuture<>()); public void onMessage(Message message, byte[] pattern) {
} final String lockKey = new String(message.getBody());
unlockNotify(lockKey);
}
public void unSubscribeLock(String localLock) { public Future<String> subscribeLock(String lockKey) {
this.notifyMap.remove(localLock); return this.notifyMap.computeIfAbsent(lockKey, key -> new SettableListenableFuture<>());
} }
private void unlockNotify(String lockKey) { public void unSubscribeLock(String localLock) {
this.notifyMap.computeIfPresent(lockKey, (key, lockFuture) -> { this.notifyMap.remove(localLock);
lockFuture.set(key); }
return lockFuture;
});
}
private void unlockNotify(String lockKey) {
this.notifyMap.computeIfPresent(lockKey, (key, lockFuture) -> {
lockFuture.set(key);
return lockFuture;
});
} }
} }