diff --git a/.gitignore b/.gitignore index efe6ef0..c0afffe 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ hs_err_pid* /target/ **/target/ + +*.iml +/.idea + diff --git a/swagger-dubbo/src/main/java/com/deepoove/swagger/dubbo/reader/DubboReaderExtension.java b/swagger-dubbo/src/main/java/com/deepoove/swagger/dubbo/reader/DubboReaderExtension.java index ed8c28d..181f0a6 100644 --- a/swagger-dubbo/src/main/java/com/deepoove/swagger/dubbo/reader/DubboReaderExtension.java +++ b/swagger-dubbo/src/main/java/com/deepoove/swagger/dubbo/reader/DubboReaderExtension.java @@ -3,16 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; +import io.swagger.models.properties.*; import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.databind.JavaType; @@ -42,10 +35,6 @@ import io.swagger.models.parameters.FormParameter; import io.swagger.models.parameters.Parameter; import io.swagger.models.parameters.QueryParameter; -import io.swagger.models.properties.ArrayProperty; -import io.swagger.models.properties.MapProperty; -import io.swagger.models.properties.Property; -import io.swagger.models.properties.RefProperty; import io.swagger.util.BaseReaderUtils; import io.swagger.util.ParameterProcessor; import io.swagger.util.PathUtils; @@ -451,7 +440,10 @@ private Parameter readParam(Swagger swagger, Type type,Class cls, ApiParam pa }else{ //hack: Get the from data model paramter from BodyParameter BodyParameter bp = (BodyParameter)parameter; - bp.setIn("formData"); + bp.setIn("body"); + Property property = ModelConverters.getInstance().readAsProperty(type); + final Map args = new EnumMap(PropertyBuilder.PropertyId.class); + bp.setSchema(PropertyBuilder.toModel(PropertyBuilder.merge(property, args))); } return parameter; }