findName属性

Author: zxcvbnmzsedr

apidoc-core/src/main/java/com/ztianzeng/apidoc/ModelResolver.java

@@ -54,7 +54,8 @@ public Schema resolve(AnnotatedType annotatedType,
 
         String parentName = annotatedType.getName();
         if (StringUtils.isBlank(parentName)) {
-            parentName = targetClass.getName();
+            parentName = findName(targetClass, new StringBuilder());
+            ;
         }
 
 
@@ -229,4 +230,25 @@ public void setRefType(JavaClass type, Schema schema, AnnotatedType annotatedTyp
         }
     }
 
+    /**
+     * 设置泛型
+     *
+     * @param type
+     */
+    public String findName(JavaClass type, StringBuilder stringBuilder) {
+
+        stringBuilder.append(type.getName());
+        if (type instanceof DefaultJavaParameterizedType) {
+            List<JavaType> ref = ((DefaultJavaParameterizedType) type).getActualTypeArguments();
+            if (!ref.isEmpty()) {
+                for (JavaType actualTypeArgument : ref) {
+                    if (actualTypeArgument instanceof DefaultJavaParameterizedType) {
+                        return findName((DefaultJavaParameterizedType) actualTypeArgument, stringBuilder);
+                    }
+                }
+            }
+        }
+        return stringBuilder.toString();
+    }
+
 }

apidoc-core/src/main/java/com/ztianzeng/apidoc/Reader.java

@@ -275,9 +275,9 @@ public Operation parseMethod(JavaMethod javaMethod, boolean deprecated, String t
 
         if (objectSchema != null) {
             if (objectSchema instanceof ArraySchema) {
-                ((ArraySchema) objectSchema).getItems().$ref(constructRef(schemaMap.keySet().stream().findFirst().orElse("")));
+                ((ArraySchema) objectSchema).getItems().$ref(constructRef(objectSchema.getName()));
             } else {
-                objectSchema.$ref(constructRef(schemaMap.keySet().stream().findFirst().orElse("")));
+                objectSchema.$ref(constructRef(objectSchema.getName()));
 
             }
         }