Merge branch 'namkee-issues/1282'

closes springfox#1282

Author: dilipkrish

springfox-schema/src/main/java/springfox/documentation/schema/DefaultModelDependencyProvider.java

@@ -38,7 +38,7 @@
 import static com.google.common.collect.FluentIterable.*;
 import static com.google.common.collect.Lists.*;
 import static springfox.documentation.schema.Collections.*;
-import static springfox.documentation.schema.Maps.isMapType;
+import static springfox.documentation.schema.Maps.*;
 import static springfox.documentation.schema.ResolvedTypes.*;
 
 @Component
@@ -64,9 +64,9 @@ public DefaultModelDependencyProvider(
   @Override
   public Set<ResolvedType> dependentModels(ModelContext modelContext) {
     return from(resolvedDependencies(modelContext))
-            .filter(ignorableTypes(modelContext))
-            .filter(not(baseTypes(modelContext)))
-            .toSet();
+        .filter(ignorableTypes(modelContext))
+        .filter(not(baseTypes(modelContext)))
+        .toSet();
   }
 
   private Predicate<ResolvedType> baseTypes(final ModelContext modelContext) {
@@ -101,10 +101,23 @@ private List<ResolvedType> resolvedDependencies(ModelContext modelContext) {
       return newArrayList();
     }
     List<ResolvedType> dependencies = newArrayList(resolvedTypeParameters(modelContext, resolvedType));
+    dependencies.addAll(resolvedArrayElementType(modelContext, resolvedType));
     dependencies.addAll(resolvedPropertiesAndFields(modelContext, resolvedType));
     return dependencies;
   }
 
+  private List<? extends ResolvedType> resolvedArrayElementType(ModelContext modelContext, ResolvedType resolvedType) {
+    List<ResolvedType> parameters = newArrayList();
+    if (resolvedType.isArray()) {
+      ResolvedType elementType = resolvedType.getArrayElementType();
+      LOG.debug("Adding type for element {}", elementType.getSignature());
+      parameters.add(modelContext.alternateFor(elementType));
+      LOG.debug("Recursively resolving dependencies for element {}", elementType.getSignature());
+      parameters.addAll(resolvedDependencies(ModelContext.fromParent(modelContext, elementType)));
+    }
+    return parameters;
+  }
+
   private List<? extends ResolvedType> resolvedTypeParameters(ModelContext modelContext, ResolvedType resolvedType) {
     List<ResolvedType> parameters = newArrayList();
     for (ResolvedType parameter : resolvedType.getTypeParameters()) {

springfox-schema/src/main/java/springfox/documentation/schema/Types.java

@@ -21,6 +21,7 @@
 
 import com.fasterxml.classmate.ResolvedType;
 import com.google.common.collect.ImmutableMap;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -38,33 +39,44 @@ private Types() {
     throw new UnsupportedOperationException();
   }
 
-  private static final Set<String> baseTypes
-          = newHashSet("int", "date", "string", "double", "float", "boolean", "byte", "object", "long", "date-time");
+  private static final Set<String> baseTypes = newHashSet(
+      "int",
+      "date",
+      "string",
+      "double",
+      "float",
+      "boolean",
+      "byte",
+      "object",
+      "long",
+      "date-time",
+      "file");
   private static final Map<Type, String> typeNameLookup = ImmutableMap.<Type, String>builder()
-          .put(Long.TYPE, "long")
-          .put(Short.TYPE, "int")
-          .put(Integer.TYPE, "int")
-          .put(Double.TYPE, "double")
-          .put(Float.TYPE, "float")
-          .put(Byte.TYPE, "byte")
-          .put(Boolean.TYPE, "boolean")
-          .put(Character.TYPE, "string")
+      .put(Long.TYPE, "long")
+      .put(Short.TYPE, "int")
+      .put(Integer.TYPE, "int")
+      .put(Double.TYPE, "double")
+      .put(Float.TYPE, "float")
+      .put(Byte.TYPE, "byte")
+      .put(Boolean.TYPE, "boolean")
+      .put(Character.TYPE, "string")
 
-          .put(Date.class, "date-time")
-          .put(String.class, "string")
-          .put(Object.class, "object")
-          .put(Long.class, "long")
-          .put(Integer.class, "int")
-          .put(Short.class, "int")
-          .put(Double.class, "double")
-          .put(Float.class, "float")
-          .put(Boolean.class, "boolean")
-          .put(Byte.class, "byte")
-          .put(BigDecimal.class, "double")
-          .put(BigInteger.class, "long")
-          .put(Currency.class, "string")
-          .put(UUID.class, "string")
-          .build();
+      .put(Date.class, "date-time")
+      .put(String.class, "string")
+      .put(Object.class, "object")
+      .put(Long.class, "long")
+      .put(Integer.class, "int")
+      .put(Short.class, "int")
+      .put(Double.class, "double")
+      .put(Float.class, "float")
+      .put(Boolean.class, "boolean")
+      .put(Byte.class, "byte")
+      .put(BigDecimal.class, "double")
+      .put(BigInteger.class, "long")
+      .put(Currency.class, "string")
+      .put(UUID.class, "string")
+      .put(MultipartFile.class, "file")
+      .build();
 
   public static String typeNameFor(Type type) {
     return typeNameLookup.get(type);

springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/Defaults.java

@@ -161,7 +161,6 @@ private void initIgnorableTypes() {
     ignored.add(BindingResult.class);
     ignored.add(ServletContext.class);
     ignored.add(UriComponentsBuilder.class);
-    ignored.add(ApiIgnore.class);
   }
 
   private void initResponseMessages() {