diff --git a/src/main/java/org/redkale/annotation/Command.java b/src/main/java/org/redkale/annotation/Command.java
index b4de4f9bd..7b50559e1 100644
--- a/src/main/java/org/redkale/annotation/Command.java
+++ b/src/main/java/org/redkale/annotation/Command.java
@@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @since 2.1.0
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/annotation/Param.java b/src/main/java/org/redkale/annotation/Param.java
index c5aa917c3..c15697834 100644
--- a/src/main/java/org/redkale/annotation/Param.java
+++ b/src/main/java/org/redkale/annotation/Param.java
@@ -5,7 +5,6 @@ package org.redkale.annotation;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -20,7 +19,6 @@ import java.lang.annotation.Target;
*
* @since 2.8.0
*/
-@Inherited
@Documented
@Target({PARAMETER})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/cache/spi/DynForCache.java b/src/main/java/org/redkale/cache/spi/DynForCache.java
index 6281ba0c4..7c147270f 100644
--- a/src/main/java/org/redkale/cache/spi/DynForCache.java
+++ b/src/main/java/org/redkale/cache/spi/DynForCache.java
@@ -5,7 +5,6 @@ package org.redkale.cache.spi;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -20,7 +19,6 @@ import org.redkale.service.LoadMode;
*
* @since 2.8.0
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/convert/ConvertCoder.java b/src/main/java/org/redkale/convert/ConvertCoder.java
index a1d80bfb8..25de13734 100644
--- a/src/main/java/org/redkale/convert/ConvertCoder.java
+++ b/src/main/java/org/redkale/convert/ConvertCoder.java
@@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.*;
* @author zhangjx
* @since 2.7.0
*/
-@Inherited
@Documented
@Target({METHOD, FIELD})
@Retention(RUNTIME)
@@ -80,7 +79,6 @@ public @interface ConvertCoder {
*
* @author zhangjx
*/
- @Inherited
@Documented
@Target({METHOD, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/convert/ConvertColumn.java b/src/main/java/org/redkale/convert/ConvertColumn.java
index 6769e0cf7..1224ca495 100644
--- a/src/main/java/org/redkale/convert/ConvertColumn.java
+++ b/src/main/java/org/redkale/convert/ConvertColumn.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({METHOD, FIELD})
@Retention(RUNTIME)
@@ -60,7 +59,6 @@ public @interface ConvertColumn {
*
* @author zhangjx
*/
- @Inherited
@Documented
@Target({METHOD, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/convert/ConvertDisabled.java b/src/main/java/org/redkale/convert/ConvertDisabled.java
index 4c6b7ee26..e5f2b6fd4 100644
--- a/src/main/java/org/redkale/convert/ConvertDisabled.java
+++ b/src/main/java/org/redkale/convert/ConvertDisabled.java
@@ -36,7 +36,6 @@ public @interface ConvertDisabled {
*
* @author zhangjx
*/
- @Inherited
@Documented
@Target({METHOD, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/lock/spi/DynForLock.java b/src/main/java/org/redkale/lock/spi/DynForLock.java
index e8467d4da..b1aeb6f32 100644
--- a/src/main/java/org/redkale/lock/spi/DynForLock.java
+++ b/src/main/java/org/redkale/lock/spi/DynForLock.java
@@ -5,7 +5,6 @@ package org.redkale.lock.spi;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -19,7 +18,6 @@ import org.redkale.service.LoadMode;
*
* @since 2.8.0
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestAddress.java b/src/main/java/org/redkale/net/http/RestAddress.java
index 4530d4570..674d15f26 100644
--- a/src/main/java/org/redkale/net/http/RestAddress.java
+++ b/src/main/java/org/redkale/net/http/RestAddress.java
@@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestBody.java b/src/main/java/org/redkale/net/http/RestBody.java
index d0bad80cf..10db27f0d 100644
--- a/src/main/java/org/redkale/net/http/RestBody.java
+++ b/src/main/java/org/redkale/net/http/RestBody.java
@@ -5,10 +5,9 @@
*/
package org.redkale.net.http;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* 只能注解于RestService类的方法的String/byte[]/JavaBean参数或参数内的String/byte[]/JavaBean字段
@@ -20,7 +19,6 @@ import static java.lang.annotation.ElementType.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestConvert.java b/src/main/java/org/redkale/net/http/RestConvert.java
index eb1d0b2de..0e68622c4 100644
--- a/src/main/java/org/redkale/net/http/RestConvert.java
+++ b/src/main/java/org/redkale/net/http/RestConvert.java
@@ -5,9 +5,9 @@
*/
package org.redkale.net.http;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* 只能依附在Service实现类的public方法上, 当方法的返回值以JSON输出时对指定类型的转换设定。
@@ -18,7 +18,6 @@ import static java.lang.annotation.ElementType.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
@@ -68,7 +67,6 @@ public @interface RestConvert {
*/
String[] convertColumns() default {};
- @Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestConvertCoder.java b/src/main/java/org/redkale/net/http/RestConvertCoder.java
index 87005ae1e..990c2531e 100644
--- a/src/main/java/org/redkale/net/http/RestConvertCoder.java
+++ b/src/main/java/org/redkale/net/http/RestConvertCoder.java
@@ -19,7 +19,6 @@ import org.redkale.convert.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
@@ -32,7 +31,6 @@ public @interface RestConvertCoder {
Class extends SimpledCoder> coder();
- @Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestCookie.java b/src/main/java/org/redkale/net/http/RestCookie.java
index b02fe5204..732c924ef 100644
--- a/src/main/java/org/redkale/net/http/RestCookie.java
+++ b/src/main/java/org/redkale/net/http/RestCookie.java
@@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestHeader.java b/src/main/java/org/redkale/net/http/RestHeader.java
index 8e0e28a19..d5562fe48 100644
--- a/src/main/java/org/redkale/net/http/RestHeader.java
+++ b/src/main/java/org/redkale/net/http/RestHeader.java
@@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestLocale.java b/src/main/java/org/redkale/net/http/RestLocale.java
index c59367c58..87d8abaef 100644
--- a/src/main/java/org/redkale/net/http/RestLocale.java
+++ b/src/main/java/org/redkale/net/http/RestLocale.java
@@ -2,9 +2,9 @@
*/
package org.redkale.net.http;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* 只能注解于Service类的方法的String参数或参数内的String字段
@@ -17,7 +17,6 @@ import static java.lang.annotation.ElementType.*;
* @author zhangjx
* @since 2.7.0
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestMapping.java b/src/main/java/org/redkale/net/http/RestMapping.java
index 35b8d73d0..d4ec0d766 100644
--- a/src/main/java/org/redkale/net/http/RestMapping.java
+++ b/src/main/java/org/redkale/net/http/RestMapping.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
@@ -88,7 +87,6 @@ public @interface RestMapping {
*/
String example() default "";
- @Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestOnMessage.java b/src/main/java/org/redkale/net/http/RestOnMessage.java
index 4f2217af2..214d0fae9 100644
--- a/src/main/java/org/redkale/net/http/RestOnMessage.java
+++ b/src/main/java/org/redkale/net/http/RestOnMessage.java
@@ -22,7 +22,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestParam.java b/src/main/java/org/redkale/net/http/RestParam.java
index 1ce85e505..135b57ff6 100644
--- a/src/main/java/org/redkale/net/http/RestParam.java
+++ b/src/main/java/org/redkale/net/http/RestParam.java
@@ -20,7 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestPath.java b/src/main/java/org/redkale/net/http/RestPath.java
index 5b3be62b7..9ce5c1e1c 100644
--- a/src/main/java/org/redkale/net/http/RestPath.java
+++ b/src/main/java/org/redkale/net/http/RestPath.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestSessionid.java b/src/main/java/org/redkale/net/http/RestSessionid.java
index a156a8d2f..3f06b2f4f 100644
--- a/src/main/java/org/redkale/net/http/RestSessionid.java
+++ b/src/main/java/org/redkale/net/http/RestSessionid.java
@@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestUploadFile.java b/src/main/java/org/redkale/net/http/RestUploadFile.java
index 1524a3f69..fce927a9e 100644
--- a/src/main/java/org/redkale/net/http/RestUploadFile.java
+++ b/src/main/java/org/redkale/net/http/RestUploadFile.java
@@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/http/RestUserid.java b/src/main/java/org/redkale/net/http/RestUserid.java
index 61a58dd54..185d57cea 100644
--- a/src/main/java/org/redkale/net/http/RestUserid.java
+++ b/src/main/java/org/redkale/net/http/RestUserid.java
@@ -20,7 +20,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* @since 2.1.0
*/
-@Inherited
@Documented
@Target({PARAMETER, FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/net/sncp/Sncp.java b/src/main/java/org/redkale/net/sncp/Sncp.java
index e5400fa6b..9aa12f50f 100644
--- a/src/main/java/org/redkale/net/sncp/Sncp.java
+++ b/src/main/java/org/redkale/net/sncp/Sncp.java
@@ -56,7 +56,6 @@ public abstract class Sncp {
*
* @author zhangjx
*/
- @Inherited
@Documented
@Target({METHOD, TYPE})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/persistence/Sql.java b/src/main/java/org/redkale/persistence/Sql.java
index 5a7d92a85..d1ed413cb 100644
--- a/src/main/java/org/redkale/persistence/Sql.java
+++ b/src/main/java/org/redkale/persistence/Sql.java
@@ -5,7 +5,6 @@ package org.redkale.persistence;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -23,7 +22,6 @@ import java.lang.annotation.Target;
*
* @since 2.8.0
*/
-@Inherited
@Documented
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/redkale/service/RetLabel.java b/src/main/java/org/redkale/service/RetLabel.java
index 19e8be300..995ef02c4 100644
--- a/src/main/java/org/redkale/service/RetLabel.java
+++ b/src/main/java/org/redkale/service/RetLabel.java
@@ -28,7 +28,6 @@ import org.redkale.util.RedkaleClassLoader;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({FIELD})
@Retention(RUNTIME)
@@ -39,7 +38,6 @@ public @interface RetLabel {
String locale() default "";
- @Inherited
@Documented
@Target({FIELD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/service/RpcAction.java b/src/main/java/org/redkale/service/RpcAction.java
index 024ba7b52..ce3aece74 100644
--- a/src/main/java/org/redkale/service/RpcAction.java
+++ b/src/main/java/org/redkale/service/RpcAction.java
@@ -3,9 +3,9 @@
*/
package org.redkale.service;
+import java.lang.annotation.*;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.*;
/**
* 用于自定义SncpActionid,默认会根据Method.toString来计算actionid
@@ -16,7 +16,6 @@ import java.lang.annotation.*;
* @author zhangjx
* @since 2.8.0
*/
-@Inherited
@Documented
@Target({METHOD})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/service/RpcAttachment.java b/src/main/java/org/redkale/service/RpcAttachment.java
index d807f1163..d1ce3a44f 100644
--- a/src/main/java/org/redkale/service/RpcAttachment.java
+++ b/src/main/java/org/redkale/service/RpcAttachment.java
@@ -5,9 +5,9 @@
*/
package org.redkale.service;
+import java.lang.annotation.*;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.*;
/**
* SNCP协议中用于CompletionHandler回调函数中的attach字段。
@@ -17,7 +17,6 @@ import java.lang.annotation.*;
*
* @author zhangjx
*/
-@Inherited
@Documented
@Target({PARAMETER})
@Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/service/RpcRemote.java b/src/main/java/org/redkale/service/RpcRemote.java
index 0f1f500bd..1d3f975ec 100644
--- a/src/main/java/org/redkale/service/RpcRemote.java
+++ b/src/main/java/org/redkale/service/RpcRemote.java
@@ -15,7 +15,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
详情见: https://redkale.org * @author zhangjx */ -@Inherited @Documented @Target({FIELD}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/service/RpcSourceAddress.java b/src/main/java/org/redkale/service/RpcSourceAddress.java index 8fa45861b..803a27d31 100644 --- a/src/main/java/org/redkale/service/RpcSourceAddress.java +++ b/src/main/java/org/redkale/service/RpcSourceAddress.java @@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * 详情见: https://redkale.org * @author zhangjx */ -@Inherited @Documented @Target({PARAMETER}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/service/RpcTargetAddress.java b/src/main/java/org/redkale/service/RpcTargetAddress.java index 75abcb5de..c73323937 100644 --- a/src/main/java/org/redkale/service/RpcTargetAddress.java +++ b/src/main/java/org/redkale/service/RpcTargetAddress.java @@ -16,7 +16,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * 详情见: https://redkale.org * @author zhangjx */ -@Inherited @Documented @Target({PARAMETER}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/service/RpcTargetTopic.java b/src/main/java/org/redkale/service/RpcTargetTopic.java index b94cf8a25..7dfced09a 100644 --- a/src/main/java/org/redkale/service/RpcTargetTopic.java +++ b/src/main/java/org/redkale/service/RpcTargetTopic.java @@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @since 2.1.0 */ -@Inherited @Documented @Target({PARAMETER}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/source/FilterColumn.java b/src/main/java/org/redkale/source/FilterColumn.java index 953505ab0..64ad11eeb 100644 --- a/src/main/java/org/redkale/source/FilterColumn.java +++ b/src/main/java/org/redkale/source/FilterColumn.java @@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author zhangjx */ -@Inherited @Documented @Target({FIELD}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/source/FilterGroup.java b/src/main/java/org/redkale/source/FilterGroup.java index 2d67fa62a..4db0902f4 100644 --- a/src/main/java/org/redkale/source/FilterGroup.java +++ b/src/main/java/org/redkale/source/FilterGroup.java @@ -62,7 +62,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author zhangjx */ -@Inherited @Documented @Target({FIELD}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/source/FilterJoinColumn.java b/src/main/java/org/redkale/source/FilterJoinColumn.java index 7f3c8a701..dbbddaed4 100644 --- a/src/main/java/org/redkale/source/FilterJoinColumn.java +++ b/src/main/java/org/redkale/source/FilterJoinColumn.java @@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author zhangjx */ -@Inherited @Documented @Target({FIELD}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/source/SourceConvert.java b/src/main/java/org/redkale/source/SourceConvert.java index 3c7a4b7ab..1de40da61 100644 --- a/src/main/java/org/redkale/source/SourceConvert.java +++ b/src/main/java/org/redkale/source/SourceConvert.java @@ -19,7 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author zhangjx */ -@Inherited @Documented @Target({METHOD}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/util/Command.java b/src/main/java/org/redkale/util/Command.java index 7d6f5ddf2..0190643c5 100644 --- a/src/main/java/org/redkale/util/Command.java +++ b/src/main/java/org/redkale/util/Command.java @@ -5,9 +5,9 @@ */ package org.redkale.util; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * 接收命令的标记, 只能标记在本地模式下Service里参数为(String)或(String, String[])的public方法上 @@ -22,7 +22,6 @@ import static java.lang.annotation.ElementType.*; * @since 2.1.0 */ @Deprecated(since = "2.8.0") -@Inherited @Documented @Target({METHOD}) @Retention(RUNTIME)