From 0983e66f95a8d11ce142902a38b9f8e88a8cec5a Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 15 Jul 2024 15:02:59 +0800 Subject: [PATCH] ref[protocol]: refactor field method --- .../com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java | 4 ++-- .../com/zfoo/protocol/serializer/cpp/CppArraySerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppByteSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppIntSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppListSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppLongSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppMapSerializer.java | 2 +- .../protocol/serializer/cpp/CppObjectProtocolSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppSetSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppShortSerializer.java | 2 +- .../com/zfoo/protocol/serializer/cpp/CppStringSerializer.java | 2 +- .../java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java index 44d7ff48..dd0d27a1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java @@ -276,8 +276,8 @@ public class CodeGenerateCpp implements ICodeGenerate { var field = sequencedFields.get(i); IFieldRegistration fieldRegistration = fieldRegistrations[GenerateProtocolFile.indexOf(fields, field)]; var fieldName = field.getName(); - var fieldTypeValue = cppSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration); - var fieldType = fieldTypeValue.getKey(); + var fieldTypeDefaultValue = cppSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(field, fieldRegistration); + var fieldType = fieldTypeDefaultValue.getKey(); var propertyFullName = StringUtils.format("{} {};", fieldType, fieldName); // 生成注释 diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java index 09e56f31..7278f9ed 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppArraySerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getType().getComponentType().getSimpleName()); return new Pair<>(StringUtils.format("vector<{}>", type), "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java index 7102903f..4a1a5d4b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppBoolSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("bool", "false"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java index 3defed02..d69c1300 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppByteSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int8_t", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java index 014c68df..181bb17b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppDoubleSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("double", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java index 4c1bc2d3..76ec420b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppFloatSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("float", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java index ed547d7c..bff9f15e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppIntSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int32_t", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java index ae88b2c3..381bc2c9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppListSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); return new Pair<>(type, "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java index 68ed9bf3..78fd5aca 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppLongSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int64_t", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java index a637667a..86835a0b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppMapSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); return new Pair<>(type, "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java index 8f66a60d..5d2cbca6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppObjectProtocolSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); var type = StringUtils.format("{}", protocolSimpleName); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java index 9e292332..979c2355 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppSetSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); return new Pair<>(type, "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java index 889da0e4..c1c8d319 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppShortSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int16_t", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java index 29db200e..d1c1e07a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppStringSerializer implements ICppSerializer { @Override - public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("string", "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java index 485539a0..8dfecaca 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java @@ -26,7 +26,7 @@ public interface ICppSerializer { /** * 获取属性的类型和默认值 */ - Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration); void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration);