From 08060a8c8611bc6240b13db7a00e123a080b9a17 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 5 Jun 2017 09:18:05 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml         |  2 +-
 src/org/redkale/boot/Application.java         |  7 ++--
 .../boot/watch/FilterWatchService.java        | 32 +++++++++----------
 .../boot/watch/TransportWatchService.java     | 30 ++++++++---------
 src/org/redkale/net/PrepareServlet.java       |  9 ++++--
 src/org/redkale/net/http/HttpServer.java      |  8 +++++
 .../redkale/net/sncp/SncpPrepareServlet.java  |  5 ---
 src/org/redkale/net/sncp/SncpServer.java      | 12 ++++---
 src/org/redkale/net/sncp/SncpServlet.java     |  4 +++
 9 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 16a7cb812..9780a6996 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -96,7 +96,7 @@
                 
     </resources> 
     <!--
-        protocol: required  server所启动的协议，Redkale内置的有HTTP、SNCP、WATCH，SNCP使用TCP实现; 
+        protocol: required  server所启动的协议，Redkale内置的有HTTP、SNCP、WATCH。协议均使用TCP实现; WATCH服务只能存在一个。
         name: 服务的名称，用于监控识别，一个配置文件中的server.name不能重复,命名规则: 字母、数字、下划线
         host:  服务所占address ， 默认: 0.0.0.0
         port:  required 服务所占端口 
diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java
index 45cdb15d8..f5704f7b7 100644
--- a/src/org/redkale/boot/Application.java
+++ b/src/org/redkale/boot/Application.java
@@ -568,13 +568,12 @@ public final class Application {
                 others.add(entry);
             }
         }
+        if (watchs.size() > 1) throw new RuntimeException("Found one more WATCH Server");
         this.watching = !watchs.isEmpty();
-        //单向SNCP服务不需要对等group
-        //if (!sncps.isEmpty() && globalNodes.isEmpty()) throw new RuntimeException("found SNCP Server node but not found <group> node info.");
 
-        runServers(timecd, sncps);  //必须确保sncp都启动后再启动其他协议
+        runServers(timecd, sncps);  //必须确保SNCP服务都启动后再启动其他服务
         runServers(timecd, others);
-        runServers(timecd, watchs); //必须在所有server都启动后再启动
+        runServers(timecd, watchs); //必须在所有服务都启动后再启动WATCH服务
         timecd.await();
         logger.info(this.getClass().getSimpleName() + " started in " + (System.currentTimeMillis() - startTime) + " ms\r\n");
         if (!singletonrun) this.serversLatch.await();
diff --git a/src/org/redkale/boot/watch/FilterWatchService.java b/src/org/redkale/boot/watch/FilterWatchService.java
index 862fb3f2d..1c0d4f31d 100644
--- a/src/org/redkale/boot/watch/FilterWatchService.java
+++ b/src/org/redkale/boot/watch/FilterWatchService.java
@@ -6,9 +6,9 @@
 package org.redkale.boot.watch;
 
 import java.io.IOException;
+import java.util.List;
 import javax.annotation.Resource;
 import org.redkale.boot.*;
-import org.redkale.net.TransportFactory;
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;
 import org.redkale.util.Comment;
@@ -20,32 +20,30 @@ import org.redkale.util.Comment;
 @RestService(name = "filter", catalog = "watch", repair = false)
 public class FilterWatchService extends AbstractWatchService {
 
-    @Comment("不存在的Group节点")
-    public static final int RET_NO_GROUP = 1601_0001;
-
     @Comment("Filter类名不存在")
-    public static final int RET_FILTER_TYPE_ILLEGAL = 1601_0002;
+    public static final int RET_FILTER_TYPE_NOT_EXISTS = 1601_0002;
 
-    @Comment("Node节点IP地址已存在")
-    public static final int RET_FILTER_EXISTS = 1601_0003;
+    @Comment("Filter类名不合法")
+    public static final int RET_FILTER_TYPE_ILLEGAL = 1601_0003;
 
-    @Comment("Node节点IP地址已存在")
-    public static final int RET_JAR_ILLEGAL = 1601_0004;
+    @Comment("Filter类名已存在")
+    public static final int RET_FILTER_EXISTS = 1601_0004;
+
+    @Comment("Filter的JAR包不存在")
+    public static final int RET_FILTER_JAR_ILLEGAL = 1601_0005;
 
     @Resource
     private Application application;
 
-    @Resource
-    private TransportFactory transportFactory;
-
     @RestMapping(name = "addfilter", auth = false, comment = "动态增加Filter")
     public RetResult addFilter(@RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar,
-        @RestParam(name = "server", comment = "Server节点名, 不指定名称则所有符合条件的Server都会增加Filter") final String serverName,
+        @RestParam(name = "server", comment = "Server节点名") final String serverName,
         @RestParam(name = "type", comment = "Filter类名") final String filterType) throws IOException {
-        if (filterType == null) return new RetResult(RET_FILTER_TYPE_ILLEGAL, "Filter Type (" + filterType + ") is illegal");
-        if (jar == null) return new RetResult(RET_JAR_ILLEGAL, "Not found jar file");
-        for (NodeServer node : application.getNodeServers()) {
-            if (node.getServer().containsFilter(filterType)) return new RetResult(RET_JAR_ILLEGAL, "Filter(" + filterType + ") exists");
+        if (filterType == null) return new RetResult(RET_FILTER_TYPE_NOT_EXISTS, "Not found Filter Type (" + filterType + ")");
+        if (jar == null) return new RetResult(RET_FILTER_JAR_ILLEGAL, "Not found jar file");
+        List<NodeServer> nodes = application.getNodeServers();
+        for (NodeServer node : nodes) {
+            if (node.getServer().containsFilter(filterType)) return new RetResult(RET_FILTER_EXISTS, "Filter(" + filterType + ") exists");
         }
         return RetResult.success();
     }
diff --git a/src/org/redkale/boot/watch/TransportWatchService.java b/src/org/redkale/boot/watch/TransportWatchService.java
index 9d8ad41b7..e76e2365b 100644
--- a/src/org/redkale/boot/watch/TransportWatchService.java
+++ b/src/org/redkale/boot/watch/TransportWatchService.java
@@ -27,13 +27,13 @@ import org.redkale.util.AnyValue.DefaultAnyValue;
 public class TransportWatchService extends AbstractWatchService {
 
     @Comment("不存在的Group节点")
-    public static final int RET_NO_GROUP = 1606_0001;
+    public static final int RET_TRANSPORT_GROUP_NOT_EXISTS = 1606_0001;
 
     @Comment("非法的Node节点IP地址")
-    public static final int RET_ADDR_ILLEGAL = 1606_0002;
+    public static final int RET_TRANSPORT_ADDR_ILLEGAL = 1606_0002;
 
     @Comment("Node节点IP地址已存在")
-    public static final int RET_ADDR_EXISTS = 1606_0003;
+    public static final int RET_TRANSPORT_ADDR_EXISTS = 1606_0003;
 
     @Resource
     private Application application;
@@ -41,14 +41,13 @@ public class TransportWatchService extends AbstractWatchService {
     @Resource
     private TransportFactory transportFactory;
 
-    @RestMapping(name = "nodes", auth = false, comment = "获取所有Node节点")
-    public RetResult<List<TransportGroupInfo>> addNode() {
-        return new RetResult<>(transportFactory.getGroupInfos());
+    @RestMapping(name = "listnodes", auth = false, comment = "获取所有Node节点")
+    public List<TransportGroupInfo> listNodes() {
+        return transportFactory.getGroupInfos();
     }
 
     @RestMapping(name = "addnode", auth = false, comment = "动态增加指定Group的Node节点")
-    public RetResult addNode(
-        @RestParam(name = "group", comment = "Group节点名") final String group,
+    public RetResult addNode(@RestParam(name = "group", comment = "Group节点名") final String group,
         @RestParam(name = "addr", comment = "节点IP") final String addr,
         @RestParam(name = "port", comment = "节点端口") final int port) throws IOException {
         InetSocketAddress address;
@@ -58,12 +57,12 @@ public class TransportWatchService extends AbstractWatchService {
             channel.connect(address).get(2, TimeUnit.SECONDS);  //连接超时2秒
             channel.close();
         } catch (Exception e) {
-            return new RetResult(RET_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") is illegal or cannot connect");
+            return new RetResult(RET_TRANSPORT_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") is illegal or cannot connect");
         }
-        if (transportFactory.findGroupName(address) != null) return new RetResult(RET_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") is exists");
+        if (transportFactory.findGroupName(address) != null) return new RetResult(RET_TRANSPORT_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") is exists");
         synchronized (this) {
             if (transportFactory.findGroupInfo(group) == null) {
-                return new RetResult(RET_NO_GROUP, "not found group (" + group + ")");
+                return new RetResult(RET_TRANSPORT_GROUP_NOT_EXISTS, "not found group (" + group + ")");
             }
             transportFactory.addGroupInfo(group, address);
             for (Service service : transportFactory.getServices()) {
@@ -97,16 +96,15 @@ public class TransportWatchService extends AbstractWatchService {
     }
 
     @RestMapping(name = "removenode", auth = false, comment = "动态删除指定Group的Node节点")
-    public RetResult removeNode(
-        @RestParam(name = "group", comment = "Group节点名") final String group,
+    public RetResult removeNode(@RestParam(name = "group", comment = "Group节点名") final String group,
         @RestParam(name = "addr", comment = "节点IP") final String addr,
         @RestParam(name = "port", comment = "节点端口") final int port) throws IOException {
-        if (group == null) return new RetResult(RET_NO_GROUP, "not found group (" + group + ")");
+        if (group == null) return new RetResult(RET_TRANSPORT_GROUP_NOT_EXISTS, "not found group (" + group + ")");
         final InetSocketAddress address = new InetSocketAddress(addr, port);
-        if (!group.equals(transportFactory.findGroupName(address))) return new RetResult(RET_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") not belong to group(" + group + ")");
+        if (!group.equals(transportFactory.findGroupName(address))) return new RetResult(RET_TRANSPORT_ADDR_ILLEGAL, "InetSocketAddress(addr=" + addr + ", port=" + port + ") not belong to group(" + group + ")");
         synchronized (this) {
             if (transportFactory.findGroupInfo(group) == null) {
-                return new RetResult(RET_NO_GROUP, "not found group (" + group + ")");
+                return new RetResult(RET_TRANSPORT_GROUP_NOT_EXISTS, "not found group (" + group + ")");
             }
             transportFactory.removeGroupInfo(group, address);
             for (Service service : transportFactory.getServices()) {
diff --git a/src/org/redkale/net/PrepareServlet.java b/src/org/redkale/net/PrepareServlet.java
index 1de5a7667..9d78e7139 100644
--- a/src/org/redkale/net/PrepareServlet.java
+++ b/src/org/redkale/net/PrepareServlet.java
@@ -150,6 +150,7 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
         filter._conf = conf;
         synchronized (filters) {
             this.filters.add(filter);
+            Collections.sort(this.filters);
         }
     }
 
@@ -197,6 +198,10 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
         }
     }
 
+    public <T extends Filter<C, R, P>> List<T> getFilters() {
+        return (List) new ArrayList<>(filters);
+    }
+
     public abstract void addServlet(S servlet, Object attachment, AnyValue conf, K... mappings);
 
     public final void prepare(final ByteBuffer buffer, final R request, final P response) throws IOException {
@@ -258,7 +263,7 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
         servlet._conf = conf;
     }
 
-    public Set<S> getServlets() {
-        return new LinkedHashSet<>(servlets);
+    public List<S> getServlets() {
+        return new ArrayList<>(servlets);
     }
 }
diff --git a/src/org/redkale/net/http/HttpServer.java b/src/org/redkale/net/http/HttpServer.java
index 528fafda1..d2492543f 100644
--- a/src/org/redkale/net/http/HttpServer.java
+++ b/src/org/redkale/net/http/HttpServer.java
@@ -38,6 +38,14 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
         super.init(config);
     }
 
+    public List<HttpServlet> getHttpServlets() {
+        return this.prepare.getServlets();
+    }
+
+    public List<HttpFilter> getHttpFilters() {
+        return this.prepare.getFilters();
+    }
+
     /**
      * 获取静态资源HttpServlet
      *
diff --git a/src/org/redkale/net/sncp/SncpPrepareServlet.java b/src/org/redkale/net/sncp/SncpPrepareServlet.java
index 9f82a4d9b..7e828df4d 100644
--- a/src/org/redkale/net/sncp/SncpPrepareServlet.java
+++ b/src/org/redkale/net/sncp/SncpPrepareServlet.java
@@ -9,7 +9,6 @@ import org.redkale.net.PrepareServlet;
 import org.redkale.util.AnyValue;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.*;
 import org.redkale.service.Service;
 import org.redkale.util.*;
 
@@ -55,10 +54,6 @@ public class SncpPrepareServlet extends PrepareServlet<DLong, SncpContext, SncpR
         return rs;
     }
 
-    public List<SncpServlet> getSncpServlets() {
-        return new ArrayList<>(getServlets());
-    }
-
     @Override
     public void init(SncpContext context, AnyValue config) {
         super.init(context, config); //必须要执行
diff --git a/src/org/redkale/net/sncp/SncpServer.java b/src/org/redkale/net/sncp/SncpServer.java
index 241b16ab9..cb0043ed0 100644
--- a/src/org/redkale/net/sncp/SncpServer.java
+++ b/src/org/redkale/net/sncp/SncpServer.java
@@ -37,6 +37,14 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
         super.init(config);
     }
 
+    public List<SncpServlet> getSncpServlets() {
+        return this.prepare.getServlets();
+    }
+
+    public List<SncpFilter> getSncpFilters() {
+        return this.prepare.getFilters();
+    }
+
     /**
      * 删除SncpFilter
      *
@@ -78,10 +86,6 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
         this.prepare.addServlet(sds, null, Sncp.getConf(sncpService));
     }
 
-    public List<SncpServlet> getSncpServlets() {
-        return ((SncpPrepareServlet) this.prepare).getSncpServlets();
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     protected SncpContext createContext() {
diff --git a/src/org/redkale/net/sncp/SncpServlet.java b/src/org/redkale/net/sncp/SncpServlet.java
index 020b6a534..e9fdfb9fc 100644
--- a/src/org/redkale/net/sncp/SncpServlet.java
+++ b/src/org/redkale/net/sncp/SncpServlet.java
@@ -40,6 +40,10 @@ public abstract class SncpServlet extends Servlet<SncpContext, SncpRequest, Sncp
         return serviceName;
     }
 
+    public Class getServiceType() {
+        return type;
+    }
+
     public abstract DLong getServiceid();
 
     protected ExecutorService getExecutor() {