From fd4f4ecc72924c4a9761bde3a4750c56e397441f Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Mon, 20 Aug 2018 14:05:16 +0300
Subject: [PATCH] refactoring

---
 .../api/RScheduledExecutorService.java        |  3 +--
 .../org/redisson/config/ConfigSupport.java    |  2 +-
 .../test/java/org/redisson/RedissonTest.java  | 25 +++++++++----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java b/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java
index a9b30074a..04b79842e 100644
--- a/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java
+++ b/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java
@@ -17,7 +17,6 @@ package org.redisson.api;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -121,7 +120,7 @@ public interface RScheduledExecutorService extends RExecutorService, ScheduledEx
      * @param cronSchedule- cron schedule object
      * @return future object
      */
-    ScheduledFuture<?> schedule(Runnable task, CronSchedule cronSchedule);
+    RScheduledFuture<?> schedule(Runnable task, CronSchedule cronSchedule);
 
     /**
      * Use {@link #cancelTask(String)}
diff --git a/redisson/src/main/java/org/redisson/config/ConfigSupport.java b/redisson/src/main/java/org/redisson/config/ConfigSupport.java
index 3a1544d49..c6eb09310 100644
--- a/redisson/src/main/java/org/redisson/config/ConfigSupport.java
+++ b/redisson/src/main/java/org/redisson/config/ConfigSupport.java
@@ -96,7 +96,7 @@ public class ConfigSupport {
 
     }
 
-    @JsonIgnoreProperties("clusterConfig")
+    @JsonIgnoreProperties({"clusterConfig", "sentinelConfig"})
     public static class ConfigMixIn {
 
         @JsonProperty
diff --git a/redisson/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java
index 6676b305f..a4234f99f 100644
--- a/redisson/src/test/java/org/redisson/RedissonTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTest.java
@@ -355,7 +355,7 @@ public class RedissonTest {
         
         Thread.sleep(15000);
         
-        latch.await();
+        assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
 
         int errors = 0;
         int success = 0;
@@ -388,7 +388,7 @@ public class RedissonTest {
         slave2.stop();
     }
 
-//    @Test
+    @Test
     public void testFailoverInCluster() throws Exception {
         RedisRunner master1 = new RedisRunner().port(6890).randomDir().nosave();
         RedisRunner master2 = new RedisRunner().port(6891).randomDir().nosave();
@@ -441,38 +441,37 @@ public class RedissonTest {
         t.start();
         t.join(1000);
 
-        Set<InetSocketAddress> addresses = new HashSet<>();
+        Set<InetSocketAddress> oldMasters = new HashSet<>();
         Collection<ClusterNode> masterNodes = redisson.getClusterNodesGroup().getNodes(NodeType.MASTER);
         for (ClusterNode clusterNode : masterNodes) {
-            addresses.add(clusterNode.getAddr());
+            oldMasters.add(clusterNode.getAddr());
         }
         
         master.stop();
         System.out.println("master " + master.getRedisServerAddressAndPort() + " has been stopped!");
         
-        Thread.sleep(TimeUnit.SECONDS.toMillis(80));
+        Thread.sleep(TimeUnit.SECONDS.toMillis(90));
         
         RedisProcess newMaster = null;
         Collection<ClusterNode> newMasterNodes = redisson.getClusterNodesGroup().getNodes(NodeType.MASTER);
         for (ClusterNode clusterNode : newMasterNodes) {
-            if (!addresses.contains(clusterNode.getAddr())) {
+            if (!oldMasters.contains(clusterNode.getAddr())) {
                 newMaster = process.getNodes().stream().filter(x -> x.getRedisServerPort() == clusterNode.getAddr().getPort()).findFirst().get();
                 break;
             }
-            System.out.println("new-master: " + clusterNode.getAddr());
         }
-                
-        Thread.sleep(50000);
+        
+        assertThat(newMaster).isNotNull();
+        
+        Thread.sleep(30000);
         
         newMaster.stop();
 
         System.out.println("new master " + newMaster.getRedisServerAddressAndPort() + " has been stopped!");
         
-        Thread.sleep(TimeUnit.SECONDS.toMillis(70));
-        
-        Thread.sleep(60000);
+        Thread.sleep(TimeUnit.SECONDS.toMillis(80));
 
-        latch.await();
+        assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
 
         int errors = 0;
         int success = 0;