From 5b6e01ecb8d8976d720ace2cce8aa6243b5826a7 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Sat, 2 Jul 2016 20:48:59 +0800 Subject: [PATCH] --- src/org/redkale/boot/Application.java | 2 - src/org/redkale/boot/ClassFilter.java | 1 - src/org/redkale/boot/NodeServer.java | 4 +- src/org/redkale/convert/AnyEncoder.java | 1 - src/org/redkale/convert/json/JsonWriter.java | 1 - src/org/redkale/net/http/HttpRequest.java | 1 - src/org/redkale/net/http/HttpResponse.java | 6 +-- src/org/redkale/net/sncp/ServiceWrapper.java | 4 +- src/org/redkale/net/sncp/Sncp.java | 56 ++++++++++---------- src/org/redkale/net/sncp/SncpDynServlet.java | 10 ++-- src/org/redkale/service/RetResult.java | 16 +++--- src/org/redkale/source/FilterNode.java | 4 +- src/org/redkale/source/FilterValue.java | 2 +- src/org/redkale/util/AsmMethodVisitor.java | 1 - src/org/redkale/util/Attribute.java | 31 ++++++----- src/org/redkale/util/ResourceFactory.java | 1 - src/org/redkale/util/Sheet.java | 1 - 17 files changed, 64 insertions(+), 78 deletions(-) diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java index 50abcec59..511c48fe2 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -33,8 +33,6 @@ import org.w3c.dom.*; *

* 进程启动类，程序启动后读取application.xml,进行classpath扫描动态加载Service与Servlet 优先加载所有SNCP协议的服务， 再加载其他协议服务， 最后进行Service、Servlet与其他资源之间的依赖注入。 *

- *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/boot/ClassFilter.java b/src/org/redkale/boot/ClassFilter.java index 717d0cf7b..ad8de5c32 100644 --- a/src/org/redkale/boot/ClassFilter.java +++ b/src/org/redkale/boot/ClassFilter.java @@ -20,7 +20,6 @@ import org.redkale.util.AnyValue.DefaultAnyValue; /** * class过滤器， 符合条件的class会保留下来存入FilterEntry。 *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index 90e4a480c..e18dd7c96 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -30,8 +30,8 @@ import org.redkale.util.*; /** * Server节点的初始化配置类 - *

- *

+ * + * * 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/convert/AnyEncoder.java b/src/org/redkale/convert/AnyEncoder.java index 1bba9b1b4..550c9a0b1 100644 --- a/src/org/redkale/convert/AnyEncoder.java +++ b/src/org/redkale/convert/AnyEncoder.java @@ -10,7 +10,6 @@ import java.lang.reflect.Type; /** * 对不明类型的对象进行序列化； BSON序列化时将对象的类名写入Writer，JSON则不写入。 *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/convert/json/JsonWriter.java b/src/org/redkale/convert/json/JsonWriter.java index 6fda666e4..df94943ec 100644 --- a/src/org/redkale/convert/json/JsonWriter.java +++ b/src/org/redkale/convert/json/JsonWriter.java @@ -13,7 +13,6 @@ import org.redkale.util.*; * * writeTo系列的方法输出的字符不能含特殊字符 *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/net/http/HttpRequest.java b/src/org/redkale/net/http/HttpRequest.java index a56ec25d7..8fe4ed638 100644 --- a/src/org/redkale/net/http/HttpRequest.java +++ b/src/org/redkale/net/http/HttpRequest.java @@ -23,7 +23,6 @@ import org.redkale.util.ByteArray; * /pipes/record/query/start:0/size:20 获取页号: int start = request.getRequstURIPath("start:", 0);
* 获取行数: int size = request.getRequstURIPath("size:", 10); *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java index 1db763da3..361d99d97 100644 --- a/src/org/redkale/net/http/HttpResponse.java +++ b/src/org/redkale/net/http/HttpResponse.java @@ -25,7 +25,6 @@ import org.redkale.util.*; * 同时提供发送json的系列接口: public void finishJson(Type type, Object obj) * RedKale提倡http+json的接口风格， 所以主要输出的数据格式为json， 同时提供异步接口。 *

- *

* 详情见: http://redkale.org * * @author zhangjx @@ -35,7 +34,6 @@ public class HttpResponse extends Response { /** * HttpResponse.finish 方法内调用 * 主要给@HttpCacheable使用 - *

*/ protected static interface BufferHandler { @@ -302,7 +300,6 @@ public class HttpResponse extends Response { /** * 以304状态码输出 - *

*/ public void finish304() { super.finish(buffer304.duplicate()); @@ -310,7 +307,6 @@ public class HttpResponse extends Response { /** * 以404状态码输出 - *

*/ public void finish404() { super.finish(buffer404.duplicate()); @@ -687,7 +683,7 @@ public class HttpResponse extends Response { * 设置内容长度 * * @param contentLength 内容长度 - * @return + * @return HttpResponse */ public HttpResponse setContentLength(long contentLength) { this.contentLength = contentLength; diff --git a/src/org/redkale/net/sncp/ServiceWrapper.java b/src/org/redkale/net/sncp/ServiceWrapper.java index 651640fd7..335a3e6bd 100644 --- a/src/org/redkale/net/sncp/ServiceWrapper.java +++ b/src/org/redkale/net/sncp/ServiceWrapper.java @@ -12,8 +12,8 @@ import org.redkale.util.*; /** * Service对象的封装类 - *

- *

+ * + * * 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/net/sncp/Sncp.java b/src/org/redkale/net/sncp/Sncp.java index fd4891626..43fa44bec 100644 --- a/src/org/redkale/net/sncp/Sncp.java +++ b/src/org/redkale/net/sncp/Sncp.java @@ -25,8 +25,8 @@ import org.redkale.util.*; /** * Service Node Communicate Protocol * 生成Service的本地模式或远程模式Service-Class的工具类 - *

- *

+ * + * * 详情见: http://redkale.org * * @author zhangjx @@ -131,50 +131,50 @@ public abstract class Sncp { /** * 

      * public class TestService implements Service{
-     * 

+     * 
      *      public String findSomeThing(){
      *          return "hello";
      *      }
-     * 

+     * 
      *      @MultiRun(selfrun = false)
      *      public void createSomeThing(TestBean bean){
      *          //do something
      *      }
-     * 

+     * 
      *      @MultiRun
      *      public String updateSomeThing(String id){
      *          return "hello" + id;
      *      }
      * }
      *
- *

+ * * 

      * @Resource(name = "")
      * @SncpDyn(remote = false)
      * @ResourceType({TestService.class})
      * public final class _DynLocalTestService extends TestService{
-     * 

+     * 
      *      @Resource
      *      private BsonConvert _redkale_convert;
-     * 

+     * 
      *      private Transport _redkale_sameGroupTransport;
-     * 

+     * 
      *      private Transport[] _redkale_diffGroupTransports;
-     * 

+     * 
      *      private SncpClient _redkale_client;
-     * 

+     * 
      *      private String _redkale_selfstring;
-     * 

+     * 
      *      @Override
      *      public String toString() {
      *          return _redkale_selfstring == null ? super.toString() : _redkale_selfstring;
      *      }
-     * 

+     * 
      *      @Override
      *      public void createSomeThing(TestBean bean){
      *          this._redkale_createSomeThing(false, true, true, bean);
      *      }
-     * 

+     * 
      *      @SncpDyn(remote = false, index = 0)
      *      public void _redkale_createSomeThing(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, TestBean bean){
      *          if(selfrunnable) super.createSomeThing(bean);
@@ -182,12 +182,12 @@ public abstract class Sncp {
      *          if (samerunnable) _redkale_client.remoteSameGroup(_redkale_convert, _sameGroupTransport, 0, true, false, false, bean);
      *          if (diffrunnable) _redkale_client.remoteDiffGroup(_redkale_convert, _diffGroupTransports, 0, true, true, false, bean);
      *      }
-     * 

+     * 
      *      @Override
      *      public String updateSomeThing(String id){
      *          return this._redkale_updateSomeThing(true, true, true, id);
      *      }
-     * 

+     * 
      *      @SncpDyn(remote = false, index = 1)
      *      public String _redkale_updateSomeThing(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, String id){
      *          String rs = super.updateSomeThing(id);
@@ -198,7 +198,7 @@ public abstract class Sncp {
      *      }
      * }
      *
- *

+ * * 创建Service的本地模式Class * * @param Service子类 @@ -823,48 +823,48 @@ public abstract class Sncp { * @SncpDyn(remote = true) * @ResourceType({TestService.class}) * public final class _DynRemoteTestService extends TestService{ - *

+ * * @Resource * private BsonConvert _redkale_convert; - *

+ * * private Transport _redkale_transport; - *

+ * * private SncpClient _redkale_client; - *

+ * * private String _redkale_selfstring; - *

+ * * @Override * public String toString() { * return _redkale_selfstring == null ? super.toString() : _redkale_selfstring; * } - *

+ * * @SncpDyn(remote = false, index = 0) * public void _redkale_createSomeThing(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, TestBean bean){ * _redkale_client.remote(_redkale_convert, _redkale_transport, 0, selfrunnable, samerunnable, diffrunnable, bean); * } - *

+ * * @SncpDyn(remote = false, index = 1) * public String _redkale_updateSomeThing(boolean selfrunnable, boolean samerunnable, boolean diffrunnable, String id){ * return _redkale_client.remote(_redkale_convert, _redkale_transport, 1, selfrunnable, samerunnable, diffrunnable, id); * } - *

+ * * @Override * public void createSomeThing(TestBean bean){ * _redkale_client.remote(_redkale_convert, _redkale_transport, 2, bean); * } - *

+ * * @Override * public String findSomeThing(){ * return _redkale_client.remote(_redkale_convert, _redkale_transport, 3); * } - *

+ * * @Override * public String updateSomeThing(String id){ * return _redkale_client.remote(_redkale_convert, _redkale_transport, 4, id); * } * } * - *

+ * * 创建远程模式的Service实例 * * @param Service泛型 diff --git a/src/org/redkale/net/sncp/SncpDynServlet.java b/src/org/redkale/net/sncp/SncpDynServlet.java index a406e8083..34eb3d740 100644 --- a/src/org/redkale/net/sncp/SncpDynServlet.java +++ b/src/org/redkale/net/sncp/SncpDynServlet.java @@ -24,7 +24,7 @@ import org.redkale.service.DynCall; /** * - *

+ * * 详情见: http://redkale.org * * @author zhangjx @@ -161,14 +161,14 @@ public final class SncpDynServlet extends SncpServlet { * 

          *  public class TestService implements Service {
          *      public boolean change(TestBean bean, String name, int id) {
-         * 

+         * 
          *      }
          *  }
-         * 

+         * 
          *  public class DynActionTestService_change extends SncpServletAction {
-         * 

+         * 
          *      public TestService service;
-         * 

+         * 
          *      @Override
          *      public void action(final BsonReader in, final BsonWriter out) throws Throwable {
          *          TestBean arg1 = convert.convertFrom(paramTypes[1], in);
diff --git a/src/org/redkale/service/RetResult.java b/src/org/redkale/service/RetResult.java
index dab55cb5e..bd87ab521 100644
--- a/src/org/redkale/service/RetResult.java
+++ b/src/org/redkale/service/RetResult.java
@@ -9,8 +9,8 @@ import org.redkale.convert.json.JsonFactory;
 
 /**
  * 通用的结果对象，在常见的HTTP+JSON接口中返回的结果需要含结果码，错误信息，和实体对象。
- * 

- * 

+ * 
+ * 
  * 详情见: http://redkale.org
  *
  * @author zhangjx
@@ -91,9 +91,9 @@ public class RetResult {
     /**
      * 同 setRetcode
      *
-     * @param retcode
+     * @param retcode retcode
      *
-     * @return
+     * @return RetResult
      */
     public RetResult retcode(int retcode) {
         this.retcode = retcode;
@@ -111,9 +111,9 @@ public class RetResult {
     /**
      * 同 setRetinfo
      *
-     * @param retinfo
+     * @param retinfo retinfo
      *
-     * @return
+     * @return RetResult
      */
     public RetResult retinfo(String retinfo) {
         this.retinfo = retinfo;
@@ -136,9 +136,9 @@ public class RetResult {
     /**
      * 同 setResult
      *
-     * @param result
+     * @param result result
      *
-     * @return
+     * @return RetResult
      */
     public RetResult result(T result) {
         this.result = result;
diff --git a/src/org/redkale/source/FilterNode.java b/src/org/redkale/source/FilterNode.java
index 949c0c172..ba9db47e9 100644
--- a/src/org/redkale/source/FilterNode.java
+++ b/src/org/redkale/source/FilterNode.java
@@ -14,8 +14,8 @@ import org.redkale.util.Attribute;
 
 /**
  * 注意： 在调用 createSQLExpress 之前必须先调用 createSQLJoin 在调用 createPredicate 之前必须先调用 isCacheUseable
- * 

- * 

+ * 
+ * 
  * 详情见: http://redkale.org
  *
  * @author zhangjx
diff --git a/src/org/redkale/source/FilterValue.java b/src/org/redkale/source/FilterValue.java
index fe539e14e..e7cfaa12e 100644
--- a/src/org/redkale/source/FilterValue.java
+++ b/src/org/redkale/source/FilterValue.java
@@ -6,7 +6,7 @@
 package org.redkale.source;
 
 /**
- * FilterValue主要用于复杂的表达式， 例如: col / 10 = 3 、MOD(col, 8) > 0 这些都不是单独一个数值能表达的，因此需要FilterValue 才构建 8 、 > 、0 组合值.
+ * FilterValue主要用于复杂的表达式， 例如: col / 10 = 3 、MOD(col, 8) > 0 这些都不是单独一个数值能表达的，因此需要FilterValue 才构建 8 、 > 、0 组合值.
  *
  * 

  * 详情见: http://redkale.org
diff --git a/src/org/redkale/util/AsmMethodVisitor.java b/src/org/redkale/util/AsmMethodVisitor.java
index 3a262b5ec..2284b593f 100644
--- a/src/org/redkale/util/AsmMethodVisitor.java
+++ b/src/org/redkale/util/AsmMethodVisitor.java
@@ -11,7 +11,6 @@ import jdk.internal.org.objectweb.asm.*;
 /**
  * MethodVisitor 的调试类
  * 

- * 

  * 详情见: http://redkale.org
  *
  * @author zhangjx
diff --git a/src/org/redkale/util/Attribute.java b/src/org/redkale/util/Attribute.java
index be0aacc27..f7f2a2908 100644
--- a/src/org/redkale/util/Attribute.java
+++ b/src/org/redkale/util/Attribute.java
@@ -14,13 +14,13 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
  * 该类实现动态映射一个JavaBean类中成员对应的getter、setter方法； 代替低效的反射实现方式。
  * 
  *  public class Record {
- * 

+ *
  *      private String name;
- * 

+ *
  *      public String getName() {
  *          return name;
  *      }
- * 

+ *
  *      public void setName(String name) {
  *          this.name = name;
  *      }
@@ -33,27 +33,27 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
  * 等价于:
  * 
  *  Attribute<Record, String> nameAction = new Attribute<Record, String>() {
- * 

+ *
  *      @Override
  *      public String field() {
  *          return "name";
  *      }
- * 

+ *
  *      @Override
  *      public String get(Record obj) {
  *          return obj.getName();
  *      }
- * 

+ * 
  *      @Override
  *      public void set(Record obj, String value) {
  *          obj.setName(value);
  *      }
- * 

+ * 
  *      @Override
  *      public Class type() {
  *          return String.class;
  *      }
- * 

+ * 
  *      @Override
  *      public Class declaringClass() {
  *          return Record.class;
@@ -67,7 +67,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
  * 当不存在getter方法时，get操作固定返回null 

  * 当不存在setter方法时，set操作为空方法  

  * 

- * 

  * 详情见: http://redkale.org
  *
  * @author zhangjx
@@ -339,20 +338,20 @@ public interface Attribute {
     /**
      * 根据Class、字段别名、字段类型生成虚构的 Attribute 对象,get、set方法为空方法。
      *
-     * @param 
-     * @param 
-     * @param clazz
-     * @param fieldalias
-     * @param fieldtype
+     * @param         依附类的类型
+     * @param         字段类型
+     * @param clazz      指定依附的类
+     * @param fieldalias 字段别名
+     * @param fieldtype  字段的类
      *
-     * @return
+     * @return Attribute对象
      */
     public static  Attribute create(final Class clazz, String fieldalias, final Class fieldtype) {
         return create(clazz, fieldalias, fieldtype, null, null, null);
     }
 
     /**
-     * 根据Class、字段别名、字段类型、Field、getter和setter方法生成 Attribute 对象。 fieldalias&fieldtype、Field、tgetter、setter不能同时为null
+     * 根据Class、字段别名、字段类型、Field、getter和setter方法生成 Attribute 对象。 fieldalias/fieldtype、Field、tgetter、setter不能同时为null.
      *
      * @param         依附类的类型
      * @param         字段类型
diff --git a/src/org/redkale/util/ResourceFactory.java b/src/org/redkale/util/ResourceFactory.java
index 7a9ea0d09..915792b85 100644
--- a/src/org/redkale/util/ResourceFactory.java
+++ b/src/org/redkale/util/ResourceFactory.java
@@ -16,7 +16,6 @@ import javax.annotation.Resource;
 /**
  * 如果Resource(name = "$") 表示资源name采用所属对象的name
  * 

- * 

  * 详情见: http://redkale.org
  *
  * @author zhangjx
diff --git a/src/org/redkale/util/Sheet.java b/src/org/redkale/util/Sheet.java
index a2ec3e32c..a203a6a6f 100644
--- a/src/org/redkale/util/Sheet.java
+++ b/src/org/redkale/util/Sheet.java
@@ -12,7 +12,6 @@ import java.util.stream.*;
 /**
  * 页集合。 结构由一个total总数和一个List列表组合而成。
  * 

- * 

  * 详情见: http://redkale.org
  *
  * @author zhangjx