diff --git a/protocol/src/main/java/com/zfoo/protocol/anno/Note.java b/protocol/src/main/java/com/zfoo/protocol/anno/Note.java index bf102828..101b20fc 100644 --- a/protocol/src/main/java/com/zfoo/protocol/anno/Note.java +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Note.java @@ -19,7 +19,7 @@ import java.lang.annotation.*; */ @Documented @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) +@Target({ElementType.FIELD, ElementType.TYPE}) public @interface Note { String value() default ""; diff --git a/protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java b/protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java index bbc92efb..2cd33417 100644 --- a/protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java @@ -26,6 +26,5 @@ public @interface Protocol { boolean enhance() default true; - String note() default ""; } diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java index 42e9cb5b..84686ac5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java @@ -109,9 +109,9 @@ public abstract class GenerateProtocolNote { for (var protocolRegistration : protocolRegistrations) { var protocolClazz = protocolRegistration.protocolConstructor().getDeclaringClass(); var classNote = StringUtils.EMPTY; - var protocolClass = protocolClazz.getDeclaredAnnotation(Protocol.class); - if (protocolClass != null && StringUtils.isNotEmpty(protocolClass.note())) { - classNote = StringUtils.trim(protocolClass.note()); + var protocolClass = protocolClazz.getDeclaredAnnotation(Note.class); + if (protocolClass != null && StringUtils.isNotEmpty(protocolClass.value())) { + classNote = StringUtils.trim(protocolClass.value()); } var fieldNoteMap = new HashMap(); diff --git a/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java b/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java index ab6cacdd..0b5fe779 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java @@ -20,7 +20,8 @@ import com.zfoo.protocol.anno.Protocol; import java.util.*; -@Protocol(id = 100, note = "复杂的对象,包括了各种复杂的结构,数组,List,Set,Map") +@Protocol(id = 100) +@Note("复杂的对象,包括了各种复杂的结构,数组,List,Set,Map") public class ComplexObject {