ref[protocol]: refactor field method

zfoo-project · Jul 15, 2024 · 9179b85 · 9179b85
1 parent 1ba4710
commit 9179b85
Show file tree

Hide file tree

Showing 30 changed files with 47 additions and 48 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
@@ -276,11 +276,10 @@ private String protocol_field_definition(ProtocolRegistration registration) {
             var field = sequencedFields.get(i);
             IFieldRegistration fieldRegistration = fieldRegistrations[GenerateProtocolFile.indexOf(fields, field)];
             var fieldName = field.getName();
-            var propertyTypeAndName = cppSerializer(fieldRegistration.serializer()).field(field, fieldRegistration);
-            var propertyType = propertyTypeAndName.getKey();
-            var propertyName = propertyTypeAndName.getValue();
+            var fieldTypeValue = cppSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration);
+            var fieldType = fieldTypeValue.getKey();
 
-            var propertyFullName = StringUtils.format("{} {};", propertyType, propertyName);
+            var propertyFullName = StringUtils.format("{} {};", fieldType, fieldName);
             // 生成注释
             var fieldNotes = GenerateProtocolNote.fieldNotes(protocolId, fieldName, CodeLanguage.Cpp);
             for (var fieldNote : fieldNotes) {

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
@@ -32,9 +32,9 @@
 public class CppArraySerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = CodeGenerateCpp.toCppClassName(field.getType().getComponentType().getSimpleName());
-        return new Pair<>(StringUtils.format("vector<{}>", type), field.getName());
+        return new Pair<>(StringUtils.format("vector<{}>", type), "null");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppBoolSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("bool", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("bool", "false");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppByteSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("int8_t", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("int8_t", "0");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppDoubleSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("double", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("double", "0");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppFloatSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("float", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("float", "0");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppIntSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("int32_t", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("int32_t", "0");
     }
 
     @Override

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
@@ -32,9 +32,9 @@
 public class CppListSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString());
-        return new Pair<>(type, field.getName());
+        return new Pair<>(type, "null");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppLongSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("int64_t", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("int64_t", "0");
     }
 
     @Override

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
@@ -32,9 +32,9 @@
 public class CppMapSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString());
-        return new Pair<>(type, field.getName());
+        return new Pair<>(type, "null");
     }
 
     @Override

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
@@ -32,11 +32,11 @@
 public class CppObjectProtocolSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration;
         var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId());
         var type = StringUtils.format("{}", protocolSimpleName);
-        return new Pair<>(type, field.getName());
+        return new Pair<>(type, "null");
     }
 
     @Override

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
@@ -32,9 +32,9 @@
 public class CppSetSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString());
-        return new Pair<>(type, field.getName());
+        return new Pair<>(type, "null");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppShortSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("int16_t", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("int16_t", "0");
     }
 
     @Override

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
@@ -28,8 +28,8 @@
 public class CppStringSerializer implements ICppSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
-        return new Pair<>("string", field.getName());
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
+        return new Pair<>("string", "null");
     }
 
     @Override

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
@@ -24,9 +24,9 @@
 public interface ICppSerializer {
 
     /**
-     * 获取属性的类型和名称
+     * 获取属性的类型和默认值
      */
-    Pair<String, String> field(Field field, IFieldRegistration fieldRegistration);
+    Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration);
 
     void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration);
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java
@@ -293,7 +293,7 @@ private String protocol_field_definition(ProtocolRegistration registration) {
             for (var fieldNote : fieldNotes) {
                 tsBuilder.append(fieldNote).append(LS);
             }
-            var pair = tsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration);
+            var pair = tsSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration);
             tsBuilder.append(StringUtils.format("{}: {} = {};", fieldName, pair.getKey(), pair.getValue())).append(LS);
         }
         return tsBuilder.toString();

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java
@@ -24,9 +24,9 @@
 public interface ITsSerializer {
 
     /**
-     * 获取属性的类型，名称，默认值
+     * 获取属性的类型，默认值
      */
-    Pair<String, String> field(Field field, IFieldRegistration fieldRegistration);
+    Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration);
 
     void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration);
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java
@@ -31,7 +31,7 @@
 public class TsArraySerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(field.getType().getComponentType().getSimpleName()));
         return new Pair<>(type, "[]");
     }

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java
@@ -28,7 +28,7 @@
 public class TsBoolSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("boolean", "false");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java
@@ -28,7 +28,7 @@
 public class TsByteSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java
@@ -28,7 +28,7 @@
 public class TsDoubleSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java
@@ -28,7 +28,7 @@
 public class TsFloatSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java
@@ -29,7 +29,7 @@
 public class TsIntSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java
@@ -31,7 +31,7 @@
 public class TsListSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()));
         return new Pair<>(type, "[]");
     }

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java
@@ -28,7 +28,7 @@
 public class TsLongSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java
@@ -31,7 +31,7 @@
 public class TsMapSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()));
         return new Pair<>(type, "new Map()");
     }

diff --git a/...col/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java b/...col/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java
@@ -30,7 +30,7 @@
 public class TsObjectProtocolSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration;
         var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId());
         var type = StringUtils.format("{} | null", protocolSimpleName);

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java
@@ -31,7 +31,7 @@
 public class TsSetSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()));
         return new Pair<>(type, "new Set()");
     }

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java
@@ -28,7 +28,7 @@
 public class TsShortSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("number", "0");
     }
 

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java
@@ -28,7 +28,7 @@
 public class TsStringSerializer implements ITsSerializer {
 
     @Override
-    public Pair<String, String> field(Field field, IFieldRegistration fieldRegistration) {
+    public Pair<String, String> fieldTypeValue(Field field, IFieldRegistration fieldRegistration) {
         return new Pair<>("string", "''");
     }