From 017ab1ae84f788fa6167216328d7a9e058182f48 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Fri, 12 May 2017 22:02:19 +0800
Subject: [PATCH]

---
 conf/application.xml                          |  8 ++++--
 src/META-INF/application-template.xml         |  2 +-
 src/org/redkale/boot/NodeHttpServer.java      |  4 +--
 .../redkale/net/http/DefaultRestServlet.java  |  2 +-
 src/org/redkale/net/http/HttpServer.java      | 26 +++++++++----------
 src/org/redkale/net/http/Rest.java            |  8 +++---
 src/org/redkale/net/http/RestHttpServlet.java |  5 +++-
 src/org/redkale/net/http/RestServlet.java     | 23 ++++++++++++++++
 8 files changed, 54 insertions(+), 24 deletions(-)
 create mode 100644 src/org/redkale/net/http/RestServlet.java

diff --git a/conf/application.xml b/conf/application.xml
index 86feddb94..f699172ac 100644
--- a/conf/application.xml
+++ b/conf/application.xml
@@ -14,14 +14,18 @@
         
     <server protocol="HTTP" host="0.0.0.0" port="6060" root="root">      
       
-        <rest base="org.redkale.net.http.RestHttpServlet"/>   
-       
         <!--
         <request>
             <remoteaddr value="request.headers.X-RemoteAddress"/>
         </request>
         -->
+        <!-- 自定Rest实现类需要继承org.redkale.net.http.RestServlet，不自定义则默认使用org.redkale.net.http.RestServlet  -->
+        <rest base="org.redkale.net.http.RestServlet"/>   
+       
         <services autoload="true"/>
+        
         <servlets path="/pipes" autoload="true" />
+        
     </server>
+    
 </application>
diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index be7593eeb..2309c145f 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -134,7 +134,7 @@
         <!-- 
            REST的核心配置项
            当Server为HTTP协议时, rest节点才有效。存在[rest]节点则Server启动时会加载REST服务, 节点可以多个
-           base:     REST服务的BaseServlet，必须是 org.redkale.net.http.RestHttpServlet 的子类，该属性值默认值为 org.redkale.net.http.DefaultRestServlet。
+           base:     REST服务的BaseServlet，必须是 org.redkale.net.http.RestServlet 的子类，该属性值默认值为 org.redkale.net.http.RestServlet。
            autoload：默认值"true"  默认值. 加载当前server所能使用的Servce对象;    
            mustsign：默认值"true" 是否只加载标记为RestService的Service类，默认只加载标记RestService且ignore=false的Service
            includes：当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
diff --git a/src/org/redkale/boot/NodeHttpServer.java b/src/org/redkale/boot/NodeHttpServer.java
index 1b07012f8..64f423b30 100644
--- a/src/org/redkale/boot/NodeHttpServer.java
+++ b/src/org/redkale/boot/NodeHttpServer.java
@@ -29,7 +29,7 @@ import org.redkale.util.*;
 @NodeProtocol({"HTTP"})
 public class NodeHttpServer extends NodeServer {
 
-    protected final boolean rest; //是否加载REST服务， 为true加载rest节点信息并将所有可REST化的Service生成RestHttpServlet
+    protected final boolean rest; //是否加载REST服务， 为true加载rest节点信息并将所有可REST化的Service生成RestServlet
 
     protected final HttpServer httpServer;
 
@@ -174,7 +174,7 @@ public class NodeHttpServer extends NodeServer {
             if (!autoload && !includeValues.contains(stypename)) return;
             if (!restFilter.accept(stypename)) return;
 
-            RestHttpServlet servlet = httpServer.addRestServlet(name, stype, service, baseServletClass, prefix, (AnyValue) null);
+            RestServlet servlet = httpServer.addRestServlet(name, stype, service, baseServletClass, prefix, (AnyValue) null);
             resourceFactory.inject(servlet, NodeHttpServer.this);
             if (finest) logger.finest(threadName + " Create RestServlet(resource.name='" + name + "') = " + servlet);
             if (ss != null) {
diff --git a/src/org/redkale/net/http/DefaultRestServlet.java b/src/org/redkale/net/http/DefaultRestServlet.java
index 0e4f73ccb..24f2f683c 100644
--- a/src/org/redkale/net/http/DefaultRestServlet.java
+++ b/src/org/redkale/net/http/DefaultRestServlet.java
@@ -8,7 +8,7 @@ package org.redkale.net.http;
 import java.io.IOException;
 
 /**
- * 默认Servlet, 没有配置RestHttpServlet实现类则使用该默认类
+ * 默认Servlet, 没有配置RestServlet实现类则使用该默认类
  * <p>
  * 详情见: https://redkale.org
  *
diff --git a/src/org/redkale/net/http/HttpServer.java b/src/org/redkale/net/http/HttpServer.java
index d2e2d4e8e..d74741784 100644
--- a/src/org/redkale/net/http/HttpServer.java
+++ b/src/org/redkale/net/http/HttpServer.java
@@ -90,46 +90,46 @@ public final class HttpServer extends Server<String, HttpContext, HttpRequest, H
     }
 
     /**
-     * 添加RestHttpServlet
+     * 添加RestServlet
      *
      * @param <S>              Service
-     * @param <T>              RestHttpServlet
+     * @param <T>              RestServlet
      * @param name             Service的资源名
      * @param serviceType      Service的类型
      * @param service          Service对象
-     * @param baseServletClass RestHttpServlet基类
+     * @param baseServletClass RestServlet基类
      * @param prefix           url前缀
      *
-     * @return RestHttpServlet
+     * @return RestServlet
      */
-    public <S extends Service, T extends RestHttpServlet> RestHttpServlet addRestServlet(String name, Class<S> serviceType, S service, Class<T> baseServletClass, String prefix) {
+    public <S extends Service, T extends RestServlet> RestServlet addRestServlet(String name, Class<S> serviceType, S service, Class<T> baseServletClass, String prefix) {
         return addRestServlet(name, serviceType, service, baseServletClass, prefix, null);
     }
 
     /**
-     * 添加RestHttpServlet
+     * 添加RestServlet
      *
      * @param <S>              Service
-     * @param <T>              RestHttpServlet
+     * @param <T>              RestServlet
      * @param name             Service的资源名
      * @param serviceType      Service的类型
      * @param service          Service对象
-     * @param baseServletClass RestHttpServlet基类
+     * @param baseServletClass RestServlet基类
      * @param prefix           url前缀
      * @param conf             配置信息
      *
-     * @return RestHttpServlet
+     * @return RestServlet
      */
-    public <S extends Service, T extends RestHttpServlet> RestHttpServlet addRestServlet(
+    public <S extends Service, T extends RestServlet> RestServlet addRestServlet(
         final String name, Class<S> serviceType, final S service, final Class<T> baseServletClass, final String prefix, AnyValue conf) {
-        RestHttpServlet servlet = null;
+        RestServlet servlet = null;
         for (final HttpServlet item : ((HttpPrepareServlet) this.prepare).getServlets()) {
-            if (!(item instanceof RestHttpServlet)) continue;
+            if (!(item instanceof RestServlet)) continue;
             if (item.getClass().getAnnotation(Rest.RestDynamic.class) == null) continue;
             try {
                 Field field = item.getClass().getDeclaredField(Rest.REST_SERVICE_FIELD_NAME);
                 if (serviceType.equals(field.getType())) {
-                    servlet = (RestHttpServlet) item;
+                    servlet = (RestServlet) item;
                     break;
                 }
             } catch (NoSuchFieldException | SecurityException e) {
diff --git a/src/org/redkale/net/http/Rest.java b/src/org/redkale/net/http/Rest.java
index bba3706c6..5c166f32b 100644
--- a/src/org/redkale/net/http/Rest.java
+++ b/src/org/redkale/net/http/Rest.java
@@ -48,7 +48,7 @@ public final class Rest {
     }
 
     /**
-     * 用于标记由Rest.createRestServlet 方法创建的RestHttpServlet
+     * 用于标记由Rest.createRestServlet 方法创建的RestServlet
      */
     @Inherited
     @Documented
@@ -104,9 +104,9 @@ public final class Rest {
         return (!controller.name().isEmpty()) ? controller.name() : serviceType.getSimpleName().replaceAll("Service.*$", "").toLowerCase();
     }
 
-    static <T extends RestHttpServlet> T createRestServlet(final Class<T> baseServletClass, final Class<? extends Service> serviceType) {
+    static <T extends RestServlet> T createRestServlet(final Class<T> baseServletClass, final Class<? extends Service> serviceType) {
         if (baseServletClass == null || serviceType == null) return null;
-        if (!RestHttpServlet.class.isAssignableFrom(baseServletClass)) return null;
+        if (!RestServlet.class.isAssignableFrom(baseServletClass)) return null;
         int mod = baseServletClass.getModifiers();
         if (!java.lang.reflect.Modifier.isPublic(mod)) return null;
         if (java.lang.reflect.Modifier.isAbstract(mod)) return null;
@@ -1060,7 +1060,7 @@ public final class Rest {
         if (type instanceof Class) return getSuperUserType((Class) type);
         if (type instanceof java.lang.reflect.ParameterizedType) {
             java.lang.reflect.ParameterizedType pt = (java.lang.reflect.ParameterizedType) type;
-            if (pt.getRawType() == RestHttpServlet.class) {
+            if (pt.getRawType() == RestServlet.class) {
                 java.lang.reflect.Type usert = pt.getActualTypeArguments()[0];
                 if (usert instanceof Class) return (Class) usert;
             }
diff --git a/src/org/redkale/net/http/RestHttpServlet.java b/src/org/redkale/net/http/RestHttpServlet.java
index 374dfb598..ed47a9f2b 100644
--- a/src/org/redkale/net/http/RestHttpServlet.java
+++ b/src/org/redkale/net/http/RestHttpServlet.java
@@ -8,13 +8,16 @@ package org.redkale.net.http;
 import java.io.*;
 
 /**
+ * 使用 RestServlet 代替
  *
  * 详情见: https://redkale.org
  *
  * @author zhangjx
+ * @deprecated
  * @param <T> 当前用户对象类型
  */
-public class RestHttpServlet<T> extends HttpServlet {
+@Deprecated
+public class RestHttpServlet<T> extends RestServlet<T> {
 
     protected T currentUser(HttpRequest req) throws IOException {
         return null;
diff --git a/src/org/redkale/net/http/RestServlet.java b/src/org/redkale/net/http/RestServlet.java
new file mode 100644
index 000000000..31857e34e
--- /dev/null
+++ b/src/org/redkale/net/http/RestServlet.java
@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.net.http;
+
+import java.io.*;
+
+/**
+ *
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <T> 当前用户对象类型
+ */
+public class RestServlet<T> extends HttpServlet {
+
+    protected T currentUser(HttpRequest req) throws IOException {
+        return null;
+    }
+
+}