From 15d36735daeb942ef598c8d3691242e3fdda1597 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Wed, 14 Sep 2016 13:11:08 +0800 Subject: [PATCH] --- src/org/redkale/convert/ConvertFactory.java | 2 +- src/org/redkale/net/http/RestHttpServlet.java | 2 +- src/org/redkale/net/http/RestMapping.java | 4 +--- src/org/redkale/net/http/RestOutput.java | 2 +- src/org/redkale/net/http/RestParam.java | 2 +- src/org/redkale/net/http/RestService.java | 1 - src/org/redkale/net/http/WebSocketServlet.java | 2 +- .../source/DistributeTableStrategy.java | 2 +- src/org/redkale/util/ByteArray.java | 18 +++++++++--------- 9 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/org/redkale/convert/ConvertFactory.java b/src/org/redkale/convert/ConvertFactory.java index 9f5e66c12..f6d9011bf 100644 --- a/src/org/redkale/convert/ConvertFactory.java +++ b/src/org/redkale/convert/ConvertFactory.java @@ -212,7 +212,7 @@ public abstract class ConvertFactory { /** * 使所有类的所有被声明为ConvertColumn.ignore = true 的字段或方法变为ConvertColumn.ignore = false * - * @param skipIgnore + * @param skipIgnore 忽略ignore * * @return 自身 */ diff --git a/src/org/redkale/net/http/RestHttpServlet.java b/src/org/redkale/net/http/RestHttpServlet.java index 838ab9472..102ded556 100644 --- a/src/org/redkale/net/http/RestHttpServlet.java +++ b/src/org/redkale/net/http/RestHttpServlet.java @@ -13,7 +13,7 @@ import org.redkale.util.Attribute; * 详情见: http://redkale.org * * @author zhangjx - * @param + * @param 当前用户对象类型 */ public abstract class RestHttpServlet extends HttpBaseServlet { diff --git a/src/org/redkale/net/http/RestMapping.java b/src/org/redkale/net/http/RestMapping.java index 912c9f1b1..ee74e4917 100644 --- a/src/org/redkale/net/http/RestMapping.java +++ b/src/org/redkale/net/http/RestMapping.java @@ -13,7 +13,6 @@ import static java.lang.annotation.RetentionPolicy.*; * 只能依附在Service实现类的public方法上 * value默认为"/" + Service的类名去掉Service字样的小写字符串 (如HelloService，的默认路径为/hello)。 *

- *

* 详情见: http://redkale.org * * @author zhangjx @@ -33,7 +32,7 @@ public @interface RestMapping { * * @return name */ - String name() default ""; + String name() default ""; String comment() default ""; //备注描述, 对应@WebAction.comment @@ -46,6 +45,5 @@ public @interface RestMapping { String[] methods() default {};//允许方法(不区分大小写),如:GET/POST/PUT,为空表示允许所有方法, 对应@WebAction.methods //String contentType() default ""; //设置Response的ContentType 默认值为 text/plain; charset=utf-8 - String jsvar() default ""; //以application/javascript输出对象是指明js的对象名，该值存在时则忽略contentType()的值 } diff --git a/src/org/redkale/net/http/RestOutput.java b/src/org/redkale/net/http/RestOutput.java index 7c744ba19..e3abc28c1 100644 --- a/src/org/redkale/net/http/RestOutput.java +++ b/src/org/redkale/net/http/RestOutput.java @@ -15,7 +15,7 @@ import java.util.*; * 详情见: http://redkale.org * * @author zhangjx - * @param + * @param 结果对象的类型 */ public class RestOutput { diff --git a/src/org/redkale/net/http/RestParam.java b/src/org/redkale/net/http/RestParam.java index a4b896433..f398e8829 100644 --- a/src/org/redkale/net/http/RestParam.java +++ b/src/org/redkale/net/http/RestParam.java @@ -10,7 +10,7 @@ import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * 只能依附在Service类的方法的参数上, name值不能是'&' + * 只能依附在Service类的方法的参数上, name值不能是'&' * name='#'表示截取uri最后一段 * name='#xxx:'表示从uri中/pipes/xxx:v/截取xxx:的值 *

diff --git a/src/org/redkale/net/http/RestService.java b/src/org/redkale/net/http/RestService.java index 190e22e6d..41c269038 100644 --- a/src/org/redkale/net/http/RestService.java +++ b/src/org/redkale/net/http/RestService.java @@ -12,7 +12,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * 只能依附在Service类上，value默认为Service的类名去掉Service字样的字符串小写 (如HelloService，的默认路径为 hello)。 *

- *

* 详情见: http://redkale.org * * @author zhangjx diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java index f07d3e08d..5b4049579 100644 --- a/src/org/redkale/net/http/WebSocketServlet.java +++ b/src/org/redkale/net/http/WebSocketServlet.java @@ -23,7 +23,7 @@ import org.redkale.util.*; * WebSocketServlet * | * | - * WebSocketEngine & WebSocketNode + * WebSocketEngine & WebSocketNode * / \ * / \ * / \ diff --git a/src/org/redkale/source/DistributeTableStrategy.java b/src/org/redkale/source/DistributeTableStrategy.java index e06d8e45d..338b42089 100644 --- a/src/org/redkale/source/DistributeTableStrategy.java +++ b/src/org/redkale/source/DistributeTableStrategy.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 详情见: http://redkale.org * * @author zhangjx - * @param + * @param Entity类型 */ public interface DistributeTableStrategy { diff --git a/src/org/redkale/util/ByteArray.java b/src/org/redkale/util/ByteArray.java index e20c458ee..85aef6308 100644 --- a/src/org/redkale/util/ByteArray.java +++ b/src/org/redkale/util/ByteArray.java @@ -94,7 +94,7 @@ public final class ByteArray { /** * 将buf内容覆盖到本对象内容中 * - * @param buf + * @param buf 目标容器 */ public void copyTo(byte[] buf) { System.arraycopy(this.content, 0, buf, 0, count); @@ -103,7 +103,7 @@ public final class ByteArray { /** * 将array的内容引用复制给本对象 * - * @param array + * @param array ByteArray */ public void directFrom(ByteArray array) { if (array != null) { @@ -115,7 +115,7 @@ public final class ByteArray { /** * 将本对象的内容引用复制给array * - * @param array + * @param array ByteArray */ public void directTo(ByteArray array) { if (array != null) { @@ -270,8 +270,8 @@ public final class ByteArray { /** * 写入ByteBuffer指定长度的数据 * - * @param buffer - * @param len + * @param buffer 数据 + * @param len 指定长度 */ public void write(ByteBuffer buffer, int len) { if (len < 1) return; @@ -294,7 +294,7 @@ public final class ByteArray { * * @param charset 字符集 * - * @return + * @return 字符串 */ public String toString(final Charset charset) { return toString(0, count, charset); @@ -305,7 +305,7 @@ public final class ByteArray { * * @param charset 字符集 * - * @return + * @return 字符串 */ public String toStringAndClear(final Charset charset) { String str = toString(0, count, charset); @@ -320,7 +320,7 @@ public final class ByteArray { * @param len 长度 * @param charset 字符集 * - * @return + * @return 字符串 */ public String toString(final int offset, int len, final Charset charset) { if (charset == null) return new String(Utility.decodeUTF8(content, offset, len)); @@ -334,7 +334,7 @@ public final class ByteArray { * @param len 长度 * @param charset 字符集 * - * @return + * @return 字符串 */ public String toDecodeString(final int offset, int len, final Charset charset) { int index = offset;