From 52445d15a7f4768287b12a6cf817f2700f7f1b3a Mon Sep 17 00:00:00 2001 From: godotg Date: Fri, 29 Jul 2022 14:41:28 +0800 Subject: [PATCH] =?UTF-8?q?perf[protocol]:=20=E7=AE=80=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generate/GenerateProtocolDocument.java | 16 ++++++++-------- .../protocol/registration/ProtocolAnalysis.java | 10 +++++----- .../anno/Note.java} | 5 ++--- .../anno/Protocol.java} | 9 ++++----- 4 files changed, 19 insertions(+), 21 deletions(-) rename protocol/src/main/java/com/zfoo/protocol/{serializer/anno/ProtocolField.java => registration/anno/Note.java} (69%) rename protocol/src/main/java/com/zfoo/protocol/{serializer/anno/ProtocolClass.java => registration/anno/Protocol.java} (51%) diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolDocument.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolDocument.java index 563e446d..1ed6c6f4 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolDocument.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolDocument.java @@ -16,8 +16,8 @@ package com.zfoo.protocol.generate; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.serializer.anno.ProtocolClass; -import com.zfoo.protocol.serializer.anno.ProtocolField; +import com.zfoo.protocol.registration.anno.Note; +import com.zfoo.protocol.registration.anno.Protocol; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; @@ -78,19 +78,19 @@ public abstract class GenerateProtocolDocument { var protocolClazz = protocolRegistration.protocolConstructor().getDeclaringClass(); var docFieldMap = new HashMap(); var docTitle = StringUtils.EMPTY; - var protocolClass = protocolClazz.getDeclaredAnnotation(ProtocolClass.class); - if (protocolClass != null && StringUtils.isNotEmpty(protocolClass.desc())) { - var docTitleBuilder = new StringBuilder().append("//").append(protocolClass.desc()); + var protocolClass = protocolClazz.getDeclaredAnnotation(Protocol.class); + if (protocolClass != null && StringUtils.isNotEmpty(protocolClass.note())) { + var docTitleBuilder = new StringBuilder().append("//").append(protocolClass.note()); docTitle = docTitleBuilder.toString(); } var registration = (ProtocolRegistration) protocolRegistration; for (var field : registration.getFields()) { - var protocolField = field.getDeclaredAnnotation(ProtocolField.class); - if (protocolField == null || StringUtils.isEmpty(protocolField.value())) { + var noteDescription = field.getDeclaredAnnotation(Note.class); + if (noteDescription == null || StringUtils.isEmpty(noteDescription.value())) { continue; } - var docBuilder = new StringBuilder().append("//").append(protocolField.value()); + var docBuilder = new StringBuilder().append("//").append(noteDescription.value()); var fieldName = field.getName(); docFieldMap.put(fieldName, docBuilder.toString()); } diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index ad5a689d..7f1aa548 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -23,8 +23,8 @@ import com.zfoo.protocol.generate.GenerateProtocolDocument; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.registration.anno.Compatible; +import com.zfoo.protocol.registration.anno.Protocol; import com.zfoo.protocol.registration.field.*; -import com.zfoo.protocol.serializer.anno.ProtocolClass; import com.zfoo.protocol.serializer.cpp.GenerateCppUtils; import com.zfoo.protocol.serializer.csharp.GenerateCsUtils; import com.zfoo.protocol.serializer.gdscript.GenerateGdUtils; @@ -486,12 +486,12 @@ public class ProtocolAnalysis { } public static short getProtocolIdByClass(Class clazz) { - var protocolClass = clazz.getDeclaredAnnotation(ProtocolClass.class); + var protocolClass = clazz.getDeclaredAnnotation(Protocol.class); short annoProtocolId = 0; - if (protocolClass != null && protocolClass.protocolId() != 0) { - annoProtocolId = protocolClass.protocolId(); + if (protocolClass != null && protocolClass.id() != 0) { + annoProtocolId = protocolClass.id(); } - + Field protocolIdField = null; try { protocolIdField = clazz.getDeclaredField(PROTOCOL_ID); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolField.java b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java similarity index 69% rename from protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolField.java rename to protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java index c4e87914..5d793c2a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolField.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java @@ -1,16 +1,15 @@ -package com.zfoo.protocol.serializer.anno; +package com.zfoo.protocol.registration.anno; import java.lang.annotation.*; /** * @author meiw * @version 3.0 - * */ @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) -public @interface ProtocolField { +public @interface Note { String value() default ""; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolClass.java b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java similarity index 51% rename from protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolClass.java rename to protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java index 72089467..6734d440 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/anno/ProtocolClass.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java @@ -1,19 +1,18 @@ -package com.zfoo.protocol.serializer.anno; +package com.zfoo.protocol.registration.anno; import java.lang.annotation.*; /** * @author meiw * @version 3.0 - * */ @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface ProtocolClass { +public @interface Protocol { - short protocolId() default 0; + short id() default 0; - String desc() default ""; + String note() default ""; }