From b2144eb081f7a78092911fd5ee352cc21953cf93 Mon Sep 17 00:00:00 2001 From: sun Date: Tue, 26 Sep 2023 13:42:45 +0800 Subject: [PATCH] ref[protocol]: modify compatible annotation --- protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java | 2 +- .../java/com/zfoo/protocol/registration/ProtocolAnalysis.java | 2 +- .../src/test/java/com/zfoo/protocol/packet/ComplexObject.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java b/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java index d293ac52..6edc5e24 100644 --- a/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java @@ -22,6 +22,6 @@ import java.lang.annotation.*; @Target({ElementType.FIELD}) public @interface Compatible { - int order(); + int value(); } 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 13b116b0..539ecda8 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -403,7 +403,7 @@ public class ProtocolAnalysis { var compatibleFieldMap = new HashMap(); for (var field : fields) { if (field.isAnnotationPresent(Compatible.class)) { - var order = field.getAnnotation(Compatible.class).order(); + var order = field.getAnnotation(Compatible.class).value(); var oldField = compatibleFieldMap.put(order, field); if (oldField != null) { throw new RunException("[{}]协议号中的[field:{}]和[field:{}]不能有相同的Compatible顺序[order:{}]", clazz.getCanonicalName(), oldField.getName(), field.getName(), oldField, order); 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 e2ca991b..ab6cacdd 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java @@ -93,9 +93,9 @@ public class ComplexObject { private Set> sssss; @Note("如果要修改协议并且兼容老协议,需要加上Compatible注解,按照增加的顺序添加order") - @Compatible(order = 1) + @Compatible(1) private int myCompatible; - @Compatible(order = 2) + @Compatible(2) private ObjectA myObject; public byte getA() {