tiennm99/zfoo
1
0 Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-10-13 08:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[protocol]: refactor protocol structure

Browse Source
This commit is contained in:
godotg committed 2023-09-03 12:30:55 +08:00
1 parent f5e906fb68
commit 2e8c673862
27 files changed
+106 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

protocol/src/main/java/com/zfoo/protocol/registration/anno/Compatible.java → protocol/src/main/java/com/zfoo/protocol/anno/Compatible.java
+1 -2
View File
@@ -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.*;
protocol/src/main/java/com/zfoo/protocol/registration/anno/NotEnhance.java → protocol/src/main/java/com/zfoo/protocol/anno/NotEnhance.java
+1 -2
View File
@@ -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.*;
protocol/src/main/java/com/zfoo/protocol/anno/Note.java
+28
View File
@@ -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 "";
}
protocol/src/main/java/com/zfoo/protocol/anno/Protocol.java
+30
View File
@@ -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 "";
}
protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolNote.java
+2 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java
+1 -1
View File
@@ -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.*;
protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
+3 -4
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/registration/ProtocolRegistration.java
+1 -1
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/registration/anno/Note.java
-16
View File
@@ -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 "";
}
protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java
-18
View File
@@ -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 "";
}
protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java
+5 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java
+5 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java
+5 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java
+5 -3
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java
+1 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
+1 -2
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java
+1 -1
View File
@@ -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;
protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java
+5 -3
View File
@@ -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
protocol/src/test/java/com/zfoo/protocol/buffer/model/BigPacket.java
+1 -1
View File
@@ -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
protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectA.java
+1 -1
View File
@@ -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;
protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectB.java
+1 -1
View File
@@ -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
protocol/src/test/java/com/zfoo/protocol/jprotobuf/ObjectC.java
+1 -1
View File
@@ -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;
protocol/src/test/java/com/zfoo/protocol/packet/ComplexObject.java
+3 -3
View File
@@ -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.*;
protocol/src/test/java/com/zfoo/protocol/packet/NormalObject.java
+1 -1
View File
@@ -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;
protocol/src/test/java/com/zfoo/protocol/packet/ObjectA.java
+1 -1
View File
@@ -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;
protocol/src/test/java/com/zfoo/protocol/packet/ObjectB.java
+1 -1
View File
@@ -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;
protocol/src/test/java/com/zfoo/protocol/packet/SimpleObject.java
+1 -1
View File
@@ -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