今天和这个测试用例刚上了

Author: zxcvbnmzsedr

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

@@ -169,7 +169,7 @@ public Schema resolve(AnnotatedType annotatedType,
             if (DocUtils.isPrimitive(field.getName())) {
                 continue;
             }
-            JavaClass type = genericityContentType(targetClass) == null ? field.getType() : genericityContentType(targetClass);
+            JavaClass type = field.getType();
 
             AnnotatedType aType = new AnnotatedType()
                     .javaClass(type)
@@ -218,32 +218,6 @@ public Schema resolve(AnnotatedType annotatedType,
         return schema;
     }
 
-    /**
-     * 设置泛型
-     *
-     * @param type
-     * @param schema
-     * @param annotatedType
-     * @param targetClass
-     * @param context
-     */
-    public void setRefType(JavaClass type, Schema schema, AnnotatedType annotatedType, JavaClass targetClass, ModelConverterContext context) {
-        List<JavaType> ref = ((DefaultJavaParameterizedType) type).getActualTypeArguments();
-        if (!ref.isEmpty()) {
-            for (JavaType actualTypeArgument : ref) {
-                AnnotatedType aType = new AnnotatedType()
-                        .javaClass((DefaultJavaParameterizedType) actualTypeArgument)
-                        .parent(schema)
-                        .resolveAsRef(annotatedType.isResolveAsRef())
-                        .jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
-                        .skipSchemaName(true)
-                        .schemaProperty(true)
-                        .propertyName(targetClass.getName());
-                context.resolve(aType);
-            }
-        }
-    }
-
     /**
      * 设置泛型
      *

apidoc-core/src/test/java/com/ztianzeng/apidoc/test/ReaderTest.java

@@ -204,37 +204,14 @@ public void testMuRet() {
                 "        msg:\n" +
                 "          type: string\n" +
                 "        data:\n" +
-                "          required:\n" +
-                "          - username\n" +
-                "          type: object\n" +
-                "          properties:\n" +
-                "            username:\n" +
-                "              type: string\n" +
-                "              description: 用户名\n" +
-                "            mobile:\n" +
-                "              type: string\n" +
-                "              description: 手机\n" +
+                "          $ref: '#/components/schemas/CreateParam'\n" +
                 "    ResultResult2CreateParam:\n" +
                 "      type: object\n" +
                 "      properties:\n" +
                 "        msg:\n" +
                 "          type: string\n" +
                 "        data:\n" +
-                "          type: object\n" +
-                "          properties:\n" +
-                "            msg:\n" +
-                "              type: string\n" +
-                "            data:\n" +
-                "              required:\n" +
-                "              - username\n" +
-                "              type: object\n" +
-                "              properties:\n" +
-                "                username:\n" +
-                "                  type: string\n" +
-                "                  description: 用户名\n" +
-                "                mobile:\n" +
-                "                  type: string\n" +
-                "                  description: 手机\n";
+                "          $ref: '#/components/schemas/Result2CreateParam'\n";
 
         SerializationMatchers.assertEqualsToYaml(openAPI, yaml);
     }