Fixed the expanded parameter plugin

Currently the swagger plugin that overlays on top of the un-annotated property incorrectly also tries to set the model ref. Rather than duplicate the behavior from the vanila plugin, we simply ignore attributes not infered from the @ApiModelProperty and @ApiParam annotations

fixes springfox#1317

Author: dilipkrish

springfox-spring-web/src/main/java/springfox/documentation/spring/web/readers/parameter/ExpandedParameterBuilder.java

@@ -43,7 +43,6 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import static com.google.common.base.Strings.*;
@@ -70,11 +69,10 @@ public void apply(ParameterExpansionContext context) {
                   ? context.getField().getName()
                   : String.format("%s.%s", context.getParentName(), context.getField().getName());
 
-    boolean isCollection = isCollection(context.getField().getType());
     String typeName = context.getDataTypeName();
     ModelReference itemModel = null;
     ResolvedType resolved = resolver.resolve(context.getField().getType());
-    if (isCollection) {
+    if (isContainerType(resolved)) {
       resolved = fieldType(context).or(resolved);
       ResolvedType elementType = collectionElementType(resolved);
       String itemTypeName = typeNameFor(elementType.getErasedType());
@@ -91,7 +89,7 @@ public void apply(ParameterExpansionContext context) {
         .description(null)
         .defaultValue(null)
         .required(Boolean.FALSE)
-        .allowMultiple(isCollection)
+        .allowMultiple(isContainerType(resolved))
         .type(resolved)
         .modelRef(new ModelRef(typeName, itemModel))
         .allowableValues(allowable)
@@ -132,10 +130,6 @@ private AllowableValues allowableValues(final Field field) {
     return allowable;
   }
 
-  private boolean isCollection(Class<?> fieldType) {
-    return Collection.class.isAssignableFrom(fieldType) || fieldType.isArray();
-  }
-
   private List<String> getEnumValues(final Class<?> subject) {
     return transform(Arrays.asList(subject.getEnumConstants()), new Function<Object, String>() {
       @Override

springfox-swagger-common/src/main/java/springfox/documentation/swagger/readers/parameter/SwaggerExpandedParameterBuilder.java

@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.AllowableListValues;
 import springfox.documentation.service.AllowableValues;
 import springfox.documentation.spi.DocumentationType;
@@ -68,36 +67,23 @@ public boolean supports(DocumentationType delimiter) {
   private void fromApiParam(ParameterExpansionContext context, ApiParam apiParam) {
     String allowableProperty = emptyToNull(apiParam.allowableValues());
     AllowableValues allowable = allowableValues(fromNullable(allowableProperty), context.getField());
-    String name = isNullOrEmpty(context.getParentName())
-            ? context.getField().getName()
-            : String.format("%s.%s", context.getParentName(), context.getField().getName());
     context.getParameterBuilder()
-            .name(name)
             .description(apiParam.value())
             .defaultValue(apiParam.defaultValue())
             .required(apiParam.required())
             .allowMultiple(apiParam.allowMultiple())
-            .modelRef(new ModelRef(context.getDataTypeName()))
             .allowableValues(allowable)
-            .parameterType("query")
             .parameterAccess(apiParam.access())
             .build();
   }
 
   private void fromApiModelProperty(ParameterExpansionContext context, ApiModelProperty apiModelProperty) {
     String allowableProperty = emptyToNull(apiModelProperty.allowableValues());
     AllowableValues allowable = allowableValues(fromNullable(allowableProperty), context.getField());
-    String name = isNullOrEmpty(context.getParentName()) ? context.getField().getName() : String.format("%s.%s",
-            context.getParentName(),
-            context.getField().getName());
     context.getParameterBuilder()
-            .name(name)
             .description(apiModelProperty.value())
-            .defaultValue(null)
             .required(apiModelProperty.required())
-            .allowMultiple(Boolean.FALSE)
-            .modelRef(new ModelRef(context.getDataTypeName()))
-            .allowableValues(allowable).parameterType("query")
+            .allowableValues(allowable)
             .parameterAccess(apiModelProperty.access())
             .build();
   }