perf[protocol]: 简化注解名称

This commit is contained in:
godotg committed 2022-07-29 14:41:28 +08:00
1 parent 496a2b7005
commit 52445d15a7
4 files changed
+19 -21

No files matched your search

@@ -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<String, String>();
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());
}
@@ -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);
@@ -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 "";
@@ -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 "";
}