From d3c6e40a952037976467222629b1ca7248caf995 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Tue, 12 Dec 2023 18:16:14 +0800
Subject: [PATCH] fix[generics]: the generic type is incorrectly assigned

---
 .../com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java  | 2 +-
 protocol/src/test/protobuf/all_type.proto                       | 2 +-
 protocol/src/test/protobuf/one_map.proto                        | 2 +-
 protocol/src/test/protobuf/one_message.proto                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java
index 0cad376e..202f063a 100644
--- a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java
@@ -174,7 +174,7 @@ public abstract class GeneratePbUtils {
         }
         if (pbField.getCardinality() == PbField.Cardinality.REPEATED) {
             var boxedTypeName = getBoxJavaType(pbField);
-            type = StringUtils.format("List<?>", boxedTypeName);
+            type = StringUtils.format("List<{}>", boxedTypeName);
             return type;
         }
         return getJavaType(type);
diff --git a/protocol/src/test/protobuf/all_type.proto b/protocol/src/test/protobuf/all_type.proto
index 0734dcde..09945357 100644
--- a/protocol/src/test/protobuf/all_type.proto
+++ b/protocol/src/test/protobuf/all_type.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 package test.message;
 import "one_map.proto";
 import "one_message.proto";
-// start_protocol_id = 100
+// start_protocol_id = 300
 
 
 // 如果字段的tag超过1000，则视这个字段为需要兼容的协议字段
diff --git a/protocol/src/test/protobuf/one_map.proto b/protocol/src/test/protobuf/one_map.proto
index 5d270e2b..a68aea2e 100644
--- a/protocol/src/test/protobuf/one_map.proto
+++ b/protocol/src/test/protobuf/one_map.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 package test.message;
-// start_protocol_id = 200
+// start_protocol_id = 400
 
 
 message OneMap {
diff --git a/protocol/src/test/protobuf/one_message.proto b/protocol/src/test/protobuf/one_message.proto
index 762ce4ee..b10e9a66 100644
--- a/protocol/src/test/protobuf/one_message.proto
+++ b/protocol/src/test/protobuf/one_message.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 package test.message;
-// start_protocol_id = 300
+// start_protocol_id = 500
 // 上面这个起始id表示整个文件的协议号从哪个开始