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) {

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
  *

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) {

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;
             }

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;

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;
+    }
+
+}