From 5319b67e4780fa1e18b7a9420ab30e109d2b64a6 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 19 Mar 2019 13:30:13 +0300
Subject: [PATCH] refactoring

---
 .../main/java/org/redisson/RedissonObject.java   |  2 +-
 .../connection/SentinelConnectionManager.java    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java
index 0f1f8842b..ba4dd5441 100644
--- a/redisson/src/main/java/org/redisson/RedissonObject.java
+++ b/redisson/src/main/java/org/redisson/RedissonObject.java
@@ -462,7 +462,7 @@ public abstract class RedissonObject implements RObject {
         RPatternTopic expiredTopic = new RedissonPatternTopic(StringCodec.INSTANCE, commandExecutor, "__keyevent@*:expired");
         expiredTopic.removeListenerAsync(listenerId).onComplete(listener);
         
-        RPatternTopic deletedTopic = new RedissonPatternTopic(StringCodec.INSTANCE, commandExecutor, "__keyevent@*:expired");
+        RPatternTopic deletedTopic = new RedissonPatternTopic(StringCodec.INSTANCE, commandExecutor, "__keyevent@*:del");
         deletedTopic.removeListenerAsync(listenerId).onComplete(listener);
         return result;
     }
diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index d0e3ac8e8..47787c094 100755
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -189,7 +189,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
             public void run() {
                 List<RedisClient> sentinels = new ArrayList<>(SentinelConnectionManager.this.sentinels.values());
                 
-                final AtomicInteger sentinelsCounter = new AtomicInteger(sentinels.size());
+                AtomicInteger sentinelsCounter = new AtomicInteger(sentinels.size());
                 FutureListener<List<InetSocketAddress>> commonListener = new FutureListener<List<InetSocketAddress>>() {
                     @Override
                     public void operationComplete(Future<List<InetSocketAddress>> future) throws Exception {
@@ -199,7 +199,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
                     }
                 };
                 
-                for (final RedisClient client : sentinels) {
+                for (RedisClient client : sentinels) {
                     Future<List<InetSocketAddress>> allNodes = sentinelResolver.resolveAll(InetSocketAddress.createUnresolved(client.getAddr().getHostName(), client.getAddr().getPort()));
                     allNodes.addListener(new FutureListener<List<InetSocketAddress>>() {
                         @Override
@@ -244,7 +244,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         }, config.getDnsMonitoringInterval(), TimeUnit.MILLISECONDS);
     }
     
-    private void scheduleChangeCheck(final SentinelServersConfig cfg, final Iterator<RedisClient> iterator) {
+    private void scheduleChangeCheck(SentinelServersConfig cfg, Iterator<RedisClient> iterator) {
         monitorFuture = group.schedule(new Runnable() {
             @Override
             public void run() {
@@ -261,7 +261,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         }, cfg.getScanInterval(), TimeUnit.MILLISECONDS);
     }
 
-    private void checkState(final SentinelServersConfig cfg, final Iterator<RedisClient> iterator, final AtomicReference<Throwable> lastException) {
+    private void checkState(SentinelServersConfig cfg, Iterator<RedisClient> iterator, AtomicReference<Throwable> lastException) {
         if (!iterator.hasNext()) {
             if (lastException.get() != null) {
                 log.error("Can't update cluster state", lastException.get());
@@ -288,7 +288,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
 
     }
 
-    private void updateState(final SentinelServersConfig cfg, final RedisConnection connection, final Iterator<RedisClient> iterator) {
+    private void updateState(SentinelServersConfig cfg, RedisConnection connection, Iterator<RedisClient> iterator) {
         AtomicInteger commands = new AtomicInteger(2);
         BiConsumer<Object, Throwable> commonListener = new BiConsumer<Object, Throwable>() {
             
@@ -317,8 +317,8 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
                 return;
             }
 
-            final String current = currentMaster.get();
-            final String newMaster = createAddress(master.get(0), master.get(1));
+            String current = currentMaster.get();
+            String newMaster = createAddress(master.get(0), master.get(1));
             if (!newMaster.equals(current)
                     && currentMaster.compareAndSet(current, newMaster)) {
                 RFuture<RedisClient> changeFuture = changeMaster(singleSlotRange.getStartSlot(), URIBuilder.create(newMaster));
@@ -437,7 +437,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         return entry;
     }
 
-    private RFuture<Void> registerSentinel(final URI addr, final MasterSlaveServersConfig c) {
+    private RFuture<Void> registerSentinel(URI addr, MasterSlaveServersConfig c) {
         String key = addr.getHost() + ":" + addr.getPort();
         RedisClient sentinel = sentinels.get(key);
         if (sentinel != null) {