diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Compatible.java b/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java similarity index 94% rename from protocol/src/main/java/com/zfoo/protocol/registration/anno/Compatible.java rename to protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java index 3e88fbfb..d19c74dd 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Compatible.java +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java @@ -8,10 +8,9 @@ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. - * */ -package com.zfoo.protocol.registration.anno; +package com.zfoo.protocol.anno; import java.lang.annotation.*; diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/anno/NotEnhance.java b/protocol/src/main/java/com/zfoo/protocol/anno/NotEnhance.java similarity index 94% rename from protocol/src/main/java/com/zfoo/protocol/registration/anno/NotEnhance.java rename to protocol/src/main/java/com/zfoo/protocol/anno/NotEnhance.java index 4a5df4b7..3a4921b7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/anno/NotEnhance.java +++ b/protocol/src/main/java/com/zfoo/protocol/anno/NotEnhance.java @@ -8,10 +8,9 @@ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and limitations under the License. - * */ -package com.zfoo.protocol.registration.anno; +package com.zfoo.protocol.anno; import java.lang.annotation.*; diff --git a/protocol/src/main/java/com/zfoo/protocol/anno/Note.java b/protocol/src/main/java/com/zfoo/protocol/anno/Note.java new file mode 100644 index 00000000..b4941ae0 --- /dev/null +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Note.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.protocol.anno; + +import java.lang.annotation.*; + +/** + * @author meiw + * @version 3.0 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +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 new file mode 100644 index 00000000..8521e060 --- /dev/null +++ b/protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.protocol.anno; + +import java.lang.annotation.*; + +/** + * @author meiw + * @version 3.0 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface Protocol { + + short id() default 0; + + 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 1aef10dc..09e23b36 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java @@ -13,12 +13,12 @@ package com.zfoo.protocol.generate; +import com.zfoo.protocol.anno.Note; +import com.zfoo.protocol.anno.Protocol; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Note; -import com.zfoo.protocol.registration.anno.Protocol; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java b/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java index 9b86c27b..3664e8bb 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java @@ -14,11 +14,11 @@ package com.zfoo.protocol.registration; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.enhance.*; import com.zfoo.protocol.serializer.reflect.*; 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 e50587f9..8dbc5b19 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -14,6 +14,9 @@ package com.zfoo.protocol.registration; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; +import com.zfoo.protocol.anno.Compatible; +import com.zfoo.protocol.anno.NotEnhance; +import com.zfoo.protocol.anno.Protocol; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; @@ -22,9 +25,6 @@ import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolNote; import com.zfoo.protocol.generate.GenerateProtocolPath; -import com.zfoo.protocol.registration.anno.Compatible; -import com.zfoo.protocol.registration.anno.NotEnhance; -import com.zfoo.protocol.registration.anno.Protocol; import com.zfoo.protocol.registration.field.*; import com.zfoo.protocol.serializer.cpp.GenerateCppUtils; import com.zfoo.protocol.serializer.csharp.GenerateCsUtils; @@ -40,7 +40,6 @@ import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.ClassUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; -import com.zfoo.protocol.xml.XmlModuleDefinition; import com.zfoo.protocol.xml.XmlProtocols; import javassist.CannotCompileException; import javassist.NotFoundException; diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolRegistration.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolRegistration.java index 9a464b36..b18cf69a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolRegistration.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolRegistration.java @@ -14,8 +14,8 @@ package com.zfoo.protocol.registration; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.buffer.ByteBufUtils; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.reflect.ISerializer; import com.zfoo.protocol.util.ReflectionUtils; diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java deleted file mode 100644 index 5d793c2a..00000000 --- a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zfoo.protocol.registration.anno; - -import java.lang.annotation.*; - -/** - * @author meiw - * @version 3.0 - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) -public @interface Note { - - String value() default ""; - -} diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java b/protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java deleted file mode 100644 index 4c6de908..00000000 --- a/protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zfoo.protocol.registration.anno; - -import java.lang.annotation.*; - -/** - * @author meiw - * @version 3.0 - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface Protocol { - - short id() default 0; - - String note() default ""; -} - diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java index a1349546..913928e5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.cpp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; @@ -23,12 +24,14 @@ import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolAnalysis; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; import com.zfoo.protocol.serializer.reflect.*; -import com.zfoo.protocol.util.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.ReflectionUtils; +import com.zfoo.protocol.util.StringUtils; import java.io.File; import java.io.IOException; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java index cf142da6..bef3c2de 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java @@ -13,17 +13,20 @@ package com.zfoo.protocol.serializer.csharp; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolNote; import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.reflect.*; -import com.zfoo.protocol.util.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.ReflectionUtils; +import com.zfoo.protocol.util.StringUtils; import java.io.File; import java.io.IOException; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java index f9fe6a3d..51596629 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.gdscript; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; @@ -21,13 +22,15 @@ import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolAnalysis; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.MapField; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; import com.zfoo.protocol.serializer.reflect.*; -import com.zfoo.protocol.util.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.ReflectionUtils; +import com.zfoo.protocol.util.StringUtils; import java.io.File; import java.io.IOException; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java index 89a4ab2a..899cdeb3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.go; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; @@ -20,15 +21,16 @@ import com.zfoo.protocol.generate.GenerateProtocolNote; import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.reflect.*; -import com.zfoo.protocol.util.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.ReflectionUtils; +import com.zfoo.protocol.util.StringUtils; import java.io.File; import java.io.IOException; -import java.lang.reflect.Field; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java index 689c4a83..169b0a7f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.javascript; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolNote; @@ -20,12 +21,10 @@ import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.reflect.*; import com.zfoo.protocol.util.ClassUtils; import com.zfoo.protocol.util.FileUtils; -import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; import java.io.File; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java index 1b2262e3..5e8e33a7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.lua; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolNote; @@ -20,12 +21,10 @@ import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.reflect.*; import com.zfoo.protocol.util.ClassUtils; import com.zfoo.protocol.util.FileUtils; -import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; import java.io.File; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java index 28586f5f..c978102c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java @@ -13,13 +13,13 @@ package com.zfoo.protocol.serializer.python; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; import com.zfoo.protocol.generate.GenerateProtocolNote; import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.csharp.GenerateCsUtils; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java index 28356bea..4d961b63 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.typescript; +import com.zfoo.protocol.anno.Compatible; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.generate.GenerateOperation; import com.zfoo.protocol.generate.GenerateProtocolFile; @@ -21,12 +22,14 @@ import com.zfoo.protocol.generate.GenerateProtocolPath; import com.zfoo.protocol.registration.IProtocolRegistration; import com.zfoo.protocol.registration.ProtocolAnalysis; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.registration.anno.Compatible; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; import com.zfoo.protocol.serializer.reflect.*; -import com.zfoo.protocol.util.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.ReflectionUtils; +import com.zfoo.protocol.util.StringUtils; import java.io.File; import java.io.IOException; @@ -36,7 +39,6 @@ import java.util.Map; import static com.zfoo.protocol.util.FileUtils.LS; import static com.zfoo.protocol.util.StringUtils.TAB; -import static com.zfoo.protocol.util.StringUtils.TAB_ASCII; /** * @author godotg diff --git a/protocol/src/test/java/com/zfoo/protocol/buffer/model/BigPacket.java b/protocol/src/test/java/com/zfoo/protocol/buffer/model/BigPacket.java index 8a290ca4..a2758bc3 100644 --- a/protocol/src/test/java/com/zfoo/protocol/buffer/model/BigPacket.java +++ b/protocol/src/test/java/com/zfoo/protocol/buffer/model/BigPacket.java @@ -13,7 +13,7 @@ package com.zfoo.protocol.buffer.model; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg diff --git a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectA.java b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectA.java index 25381b18..95ec65fb 100644 --- a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectA.java +++ b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectA.java @@ -15,7 +15,7 @@ package com.zfoo.protocol.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; import java.util.Map; diff --git a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectB.java b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectB.java index e961cc73..3c298bb3 100644 --- a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectB.java +++ b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectB.java @@ -15,7 +15,7 @@ package com.zfoo.protocol.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg diff --git a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectC.java b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectC.java index 08a5004f..9e3b2318 100644 --- a/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectC.java +++ b/protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectC.java @@ -15,7 +15,7 @@ package com.zfoo.protocol.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; import java.util.Map; 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 ef5b87e7..a089f290 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java @@ -14,9 +14,9 @@ package com.zfoo.protocol.packet; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Compatible; -import com.zfoo.protocol.registration.anno.Note; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Compatible; +import com.zfoo.protocol.anno.Note; +import com.zfoo.protocol.anno.Protocol; import java.util.*; diff --git a/protocol/src/test/java/com/zfoo/protocol/packet/NormalObject.java b/protocol/src/test/java/com/zfoo/protocol/packet/NormalObject.java index d63506b4..275dadbf 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/NormalObject.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/NormalObject.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.packet; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; diff --git a/protocol/src/test/java/com/zfoo/protocol/packet/ObjectA.java b/protocol/src/test/java/com/zfoo/protocol/packet/ObjectA.java index eddbf4dd..011beb10 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/ObjectA.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/ObjectA.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.packet; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; import java.util.Map; import java.util.Objects; diff --git a/protocol/src/test/java/com/zfoo/protocol/packet/ObjectB.java b/protocol/src/test/java/com/zfoo/protocol/packet/ObjectB.java index 115e6f56..a4c305f2 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/ObjectB.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/ObjectB.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.packet; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; diff --git a/protocol/src/test/java/com/zfoo/protocol/packet/SimpleObject.java b/protocol/src/test/java/com/zfoo/protocol/packet/SimpleObject.java index 9711450b..7abb6d5f 100644 --- a/protocol/src/test/java/com/zfoo/protocol/packet/SimpleObject.java +++ b/protocol/src/test/java/com/zfoo/protocol/packet/SimpleObject.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.packet; import com.zfoo.protocol.IPacket; -import com.zfoo.protocol.registration.anno.Protocol; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg