List集合

Author: zxcvbnmzsedr

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

@@ -9,6 +9,7 @@
 import com.ztianzeng.apidoc.converter.AnnotatedType;
 import com.ztianzeng.apidoc.converter.ModelConverter;
 import com.ztianzeng.apidoc.converter.ModelConverterContext;
+import com.ztianzeng.apidoc.models.media.ArraySchema;
 import com.ztianzeng.apidoc.models.media.MapSchema;
 import com.ztianzeng.apidoc.models.media.PrimitiveType;
 import com.ztianzeng.apidoc.models.media.Schema;
@@ -59,7 +60,6 @@ public Schema resolve(AnnotatedType annotatedType,
         }
 
 
-
         Schema resolvedModel = context.resolve(annotatedType);
         if (resolvedModel != null) {
             if (parentName.equals(resolvedModel.getName())) {
@@ -69,9 +69,14 @@ public Schema resolve(AnnotatedType annotatedType,
 
 
         // 转换成OpenApi定义的字段信息
-        PrimitiveType parentType = PrimitiveType.fromType(targetClass.getFullyQualifiedName());
+        PrimitiveType parentType = PrimitiveType.fromType(targetClass.getBinaryName());
         schema.setType(Optional.ofNullable(parentType).orElse(PrimitiveType.OBJECT).getCommonName());
         if (DocUtils.isPrimitive(targetClass.getName())) {
+            if (targetClass.isArray()) {
+                Schema array = new Schema();
+                array.setType(schema.getType());
+                schema = new ArraySchema().items(array);
+            }
             return schema;
         }
         schema.name(parentName);
@@ -89,6 +94,9 @@ public Schema resolve(AnnotatedType annotatedType,
         if (targetClass.isA(Map.class.getName())) {
             // 泛型信息
             List<JavaType> actualTypeArguments = ((DefaultJavaParameterizedType) targetClass).getActualTypeArguments();
+            if (actualTypeArguments.isEmpty()) {
+                return null;
+            }
             JavaType javaType = actualTypeArguments.get(1);
 
             Schema addPropertiesSchema = context.resolve(
@@ -116,6 +124,28 @@ public Schema resolve(AnnotatedType annotatedType,
                 }
             }
             schema = new MapSchema().additionalProperties(addPropertiesSchema);
+        } else if (targetClass.isA(Collection.class.getName())
+                || targetClass.isA(List.class.getName())) {
+            // 泛型信息
+            List<JavaType> actualTypeArguments = ((DefaultJavaParameterizedType) targetClass).getActualTypeArguments();
+            if (actualTypeArguments.isEmpty()) {
+                return null;
+            }
+            JavaType javaType = actualTypeArguments.get(0);
+            // 处理集合
+            Schema items = context.resolve(new AnnotatedType()
+                    .javaClass(builder.getClassByName(javaType.getFullyQualifiedName()))
+                    .schemaProperty(annotatedType.isSchemaProperty())
+                    .skipSchemaName(true)
+                    .resolveAsRef(annotatedType.isResolveAsRef())
+                    .propertyName(annotatedType.getPropertyName())
+                    .jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
+                    .parent(annotatedType.getParent()));
+
+            if (items == null) {
+                return null;
+            }
+            schema = new ArraySchema().items(items);
         }
 //        // 如果是集合类型，将类型向上抛出继续处理
 //        if (targetType.isContainerType()) {

apidoc-core/src/main/java/com/ztianzeng/apidoc/models/media/PrimitiveType.java

@@ -219,6 +219,7 @@ public Schema createProperty() {
         addKeys(keyClasses, NUMBER, Number.class.getName());
         addKeys(keyClasses, DATE, DateStub.class.getName());
         addKeys(keyClasses, DATE_TIME, java.util.Date.class.getName());
+        addKeys(keyClasses, DATE_TIME, Calendar.class.getName());
         addKeys(keyClasses, FILE, java.io.File.class.getName());
         addKeys(keyClasses, OBJECT, Object.class.getName());
         KEY_CLASSES = Collections.unmodifiableMap(keyClasses);

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

@@ -44,7 +44,7 @@ public void testArray() throws Exception {
     public void testMap() throws Exception {
         final ModelResolver modelResolver = new ModelResolver(mapper(), sourceBuilder);
         final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
-        JavaClass classByName = TestBase.builder.getClassByName(ArrayBean.class.getName());
+        JavaClass classByName = TestBase.builder.getClassByName(MapBean.class.getName());
 
         final Schema model = context
                 .resolve(new AnnotatedType(classByName));