add redis cluster test

mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/RedisUtil.java

@@ -4,8 +4,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/listener/ListenerDispatcher.java

@@ -1,12 +1,11 @@
 package com.shinemo.mpush.tools.redis.listener;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 public class ListenerDispatcher implements MessageListener {
@@ -23,22 +22,22 @@ public void onMessage(final String channel, final String message) {
         if (listeners == null) {
             return;
         }
-        for (final MessageListener l : listeners) {
+        for (final MessageListener listener : listeners) {
             executor.execute(new Runnable() {
                 @Override
                 public void run() {
-                    l.onMessage(channel, message);
+                	listener.onMessage(channel, message);
                 }
             });
         }
     }
 
-    public void subscribe(String channel, MessageListener l) {
+    public void subscribe(String channel, MessageListener listener) {
         List<MessageListener> listeners = subscribes.get(channel);
         if (listeners == null) {
-            listeners = new ArrayList<>();
+            listeners = Lists.newArrayList();
             subscribes.put(channel, listeners);
         }
-        listeners.add(l);
+        listeners.add(listener);
     }
 }

mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/manage/RedisManage.java

@@ -13,7 +13,10 @@
 import com.shinemo.mpush.tools.redis.RedisUtil;
 import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
 
-
+/**
+ * redis 对外封装接口
+ *
+ */
 public class RedisManage {
 
     /*********************

mpush-tools/src/test/java/com/shinemo/mpush/tools/redis/RedisClusterTest.java

@@ -0,0 +1,45 @@
+package com.shinemo.mpush.tools.redis;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.shinemo.mpush.tools.Jsons;
+
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+public class RedisClusterTest {
+
+	Set<HostAndPort> jedisClusterNodes = new HashSet<HostAndPort>();
+
+	JedisCluster cluster = null;
+
+	@Before
+	public void init() {
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7000));
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7001));
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7002));
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7003));
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7004));
+		jedisClusterNodes.add(new HostAndPort("127.0.0.1", 7005));
+		cluster = new JedisCluster(jedisClusterNodes,RedisPoolConfig.config);
+	}
+
+	@Test
+	public void test() {
+
+		User user = new User("huang", 18, new Date());
+		cluster.set("huang", Jsons.toJson(user));
+		String  ret = cluster.get("huang");
+		User newUser = Jsons.fromJson(ret, User.class);
+		System.out.println(ToStringBuilder.reflectionToString(newUser, ToStringStyle.JSON_STYLE));
+
+	}
+
+}

mpush-tools/src/test/java/com/shinemo/mpush/tools/redis/RedisGroupManageTest.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import com.shinemo.mpush.tools.redis.listener.MessageListener;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.junit.Before;
@@ -12,6 +13,7 @@
 import com.shinemo.mpush.tools.InetAddressUtil;
 import com.shinemo.mpush.tools.redis.manage.RedisGroupManage;
 import com.shinemo.mpush.tools.redis.manage.RedisManage;
+import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
 import com.shinemo.mpush.tools.zk.ServerApp;
 import com.shinemo.mpush.tools.zk.manage.ServerManage;
 
@@ -93,6 +95,16 @@ public void onMessage(String channel, String message) {
             e.printStackTrace();
         }
     }
+
+    @Test
+    public void testSub2(){
+    	RedisManage.subscribe(new Subscriber(), "channel1", "channel2");
+    	 try {
+             Thread.sleep(Integer.MAX_VALUE);
+         } catch (InterruptedException e) {
+             e.printStackTrace();
+         }
+    }
 
 
 }