Merge pull request #184 from ling-kong-ran/mybranch

fix:MAP类型未指定泛型空指针问题
jhunters · Aug 29, 2022 · 56a4856 · 56a4856
2 parents 2e8e4a7 + 49049cd
commit 56a4856
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/com/baidu/bjf/remoting/protobuf/ProtobufIDLGenerator.java b/src/main/java/com/baidu/bjf/remoting/protobuf/ProtobufIDLGenerator.java
@@ -229,6 +229,12 @@ private static void generateIDL(StringBuilder code, Class<?> cls, Set<Class<?>>
                     isMap = true;
                     Class keyClass = field.getGenericKeyType();
                     Class valueClass = field.getGenericeValueType();
+                    if (keyClass == null) {
+                        keyClass = String.class;
+                    }
+                    if (valueClass == null) {
+                        valueClass = Object.class;
+                    }
                     type = type + "<" + ProtobufProxyUtils.processProtobufType(keyClass) + ", ";
                     type = type + ProtobufProxyUtils.processProtobufType(valueClass) + ">";
 

diff --git a/src/main/java/com/baidu/bjf/remoting/protobuf/utils/ProtobufProxyUtils.java b/src/main/java/com/baidu/bjf/remoting/protobuf/utils/ProtobufProxyUtils.java
@@ -209,6 +209,9 @@ public static List<FieldInfo> processDefaultValue(List<Field> fields, boolean ig
                 if (isList) {
                     fieldTypeClass = fieldInfo.getGenericKeyType();
                 }
+                if (fieldTypeClass == null) {
+                    fieldTypeClass = Object.class;
+                }
 
                 FieldType fieldType = TYPE_MAPPING.get(fieldTypeClass);
                 if (fieldType == null) {