From e5e8dcb30fa520f3026002c869c84c238d0a7820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=97=E7=A3=8A?= <huangzl@shinemo.com>
Date: Sun, 17 Jan 2016 14:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/zk/listener/AbstractDataChangeListener.java     | 5 +++--
 .../common/zk/listener/impl/GatewayServerPathListener.java | 5 +++++
 .../cs/zk/listener/impl/ConnectionServerPathListener.java  | 5 +++++
 .../{test => main}/java/com/shinemo/mpush/ps/PushTest.java | 7 -------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename mpush-ps/src/{test => main}/java/com/shinemo/mpush/ps/PushTest.java (93%)

diff --git a/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/AbstractDataChangeListener.java b/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/AbstractDataChangeListener.java
index ccf7e8cf..a8057eba 100644
--- a/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/AbstractDataChangeListener.java
+++ b/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/AbstractDataChangeListener.java
@@ -16,7 +16,6 @@
 import com.shinemo.mpush.tools.GenericsUtil;
 import com.shinemo.mpush.tools.Jsons;
 import com.shinemo.mpush.tools.spi.ServiceContainer;
-import com.shinemo.mpush.tools.zk.ZKPath;
 import com.shinemo.mpush.tools.zk.ZkRegister;
 import com.shinemo.mpush.tools.zk.listener.DataChangeListener;
 
@@ -57,13 +56,15 @@ public void initData() {
 	
 	public abstract String getRegisterPath();
 	
+	public abstract String getFullPath(String raw);
+	
 	public abstract ServerManage<T> getServerManage();
 
 	private void _initData() {
 		// 获取机器列表
 		List<String> rawData = zkRegister.getChildrenKeys(getRegisterPath());
 		for (String raw : rawData) {
-			String fullPath = ZKPath.CONNECTION_SERVER.getFullPath(raw);
+			String fullPath = getFullPath(raw);
 			T app = getServerApplication(fullPath,clazz);
 			getServerManage().addOrUpdate(fullPath, app);
 		}
diff --git a/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/impl/GatewayServerPathListener.java b/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/impl/GatewayServerPathListener.java
index 8056f9c4..7dcc8196 100644
--- a/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/impl/GatewayServerPathListener.java
+++ b/mpush-common/src/main/java/com/shinemo/mpush/common/zk/listener/impl/GatewayServerPathListener.java
@@ -31,6 +31,11 @@ public String getRegisterPath() {
 		return ZKPath.GATEWAY_SERVER.getPath();
 	}
 
+	@Override
+	public String getFullPath(String raw) {
+		return ZKPath.GATEWAY_SERVER.getFullPath(raw);
+	}
+
 	
 
 }
diff --git a/mpush-cs/src/main/java/com/shinemo/mpush/cs/zk/listener/impl/ConnectionServerPathListener.java b/mpush-cs/src/main/java/com/shinemo/mpush/cs/zk/listener/impl/ConnectionServerPathListener.java
index d15af5c4..325d96dd 100644
--- a/mpush-cs/src/main/java/com/shinemo/mpush/cs/zk/listener/impl/ConnectionServerPathListener.java
+++ b/mpush-cs/src/main/java/com/shinemo/mpush/cs/zk/listener/impl/ConnectionServerPathListener.java
@@ -31,4 +31,9 @@ public ServerManage<ConnectionServerApplication> getServerManage() {
 		return connectionServerManage;
 	}
 
+	@Override
+	public String getFullPath(String raw) {
+		return ZKPath.CONNECTION_SERVER.getFullPath(raw);
+	}
+
 }
diff --git a/mpush-ps/src/test/java/com/shinemo/mpush/ps/PushTest.java b/mpush-ps/src/main/java/com/shinemo/mpush/ps/PushTest.java
similarity index 93%
rename from mpush-ps/src/test/java/com/shinemo/mpush/ps/PushTest.java
rename to mpush-ps/src/main/java/com/shinemo/mpush/ps/PushTest.java
index 217427c9..53c15b4f 100644
--- a/mpush-ps/src/test/java/com/shinemo/mpush/ps/PushTest.java
+++ b/mpush-ps/src/main/java/com/shinemo/mpush/ps/PushTest.java
@@ -1,22 +1,15 @@
 package com.shinemo.mpush.ps;
 
 import com.shinemo.mpush.api.PushSender;
-import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.concurrent.locks.LockSupport;
 
-
 /**
  * Created by ohun on 2016/1/7.
  */
 public class PushTest {
 
-    @Test
-    public void testSend() throws Exception {
-
-    }
-
     public static void main(String[] args) throws Exception {
         GatewayClientMain client = new GatewayClientMain();
         client.start();