fix, test for #1070

Author: fehguy

modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/ParameterProcessor.java

@@ -1,5 +1,7 @@
 package com.wordnik.swagger.jaxrs;
 
+import com.wordnik.swagger.util.Json;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.EnumMap;
@@ -108,7 +110,6 @@ public static Parameter applyAnnotations(Swagger swagger, Parameter parameter, C
         } else {
           innerType = cls.getComponentType();
         }
-        LOGGER.debug("inner type: " + innerType + " from " + cls);
         Property innerProperty = ModelConverters.getInstance().readAsProperty(innerType);
         if(innerProperty == null) {
           Map<String, Model> models = ModelConverters.getInstance().read(innerType);
@@ -168,6 +169,8 @@ public static Parameter applyAnnotations(Swagger swagger, Parameter parameter, C
           if(prop != null) {
             ModelImpl model = new ModelImpl();
             model.setType(prop.getType());
+            model.setFormat(prop.getFormat());
+            model.setDescription(prop.getDescription());
             bp.setSchema(model);
           }
         }

modules/swagger-jaxrs/src/test/scala/SimpleScannerTest.scala

@@ -295,8 +295,30 @@ class SimpleScannerTest extends FlatSpec with Matchers {
     swagger.getDefinitions().containsKey("Description") should be (true)
   }
 
+  it should "scan defaultValue and required per #937" in {
+    val swagger = new Reader(new Swagger()).read(classOf[Resource937])
+    val get = swagger.getPaths().get("/external/info").getGet()
+    val param = get.getParameters().get(0).asInstanceOf[QueryParameter]
+    param.getRequired should be (false)
+    param.getDefaultValue should be ("dogs")
+  }
+
+  it should "scan a resource with all hidden values #1073" in {
+    val swagger = new Reader(new Swagger()).read(classOf[Resource1073])
+    swagger.getPaths() should be (null)
+  }
+}
+  
+@RunWith(classOf[JUnitRunner])
+class SimpleScannerTest2 extends FlatSpec with Matchers {
   it should "scan a resource with body parameters" in {
     val swagger = new Reader(new Swagger()).read(classOf[ResourceWithBodyParams])
+    val param = swagger.getPaths().get("/testShort").getPost().getParameters().get(0).asInstanceOf[BodyParameter]
+    param.getDescription() should be ("a short input")
+    val schema = param.getSchema.asInstanceOf[ModelImpl]
+
+    schema.getType() should be ("integer")
+    schema.getFormat() should be ("int32")
 
     swagger.getDefinitions().keySet().asScala should be (Set("Tag"))
 
@@ -326,18 +348,4 @@ class SimpleScannerTest extends FlatSpec with Matchers {
       item.getParameters().size() should be (1)
     }
   }
-
-  it should "scan defaultValue and required per #937" in {
-    val swagger = new Reader(new Swagger()).read(classOf[Resource937])
-    val get = swagger.getPaths().get("/external/info").getGet()
-    val param = get.getParameters().get(0).asInstanceOf[QueryParameter]
-    param.getRequired should be (false)
-    param.getDefaultValue should be ("dogs")
-  }
-
-  it should "scan a resource with all hidden values #1073" in {
-    val swagger = new Reader(new Swagger()).read(classOf[Resource1073])
-    Json.prettyPrint(swagger)
-  }
-}
-  
+}

modules/swagger-jaxrs/src/test/scala/resources/ResourceWithBodyParams.java

@@ -75,7 +75,7 @@ public void testPrimitiveBytes(byte[] input) {
   @POST
   @Path("/testShort")
   @ApiOperation("Tests parameter of the short type")
-  public void testPrimitiveShort(short input) {
+  public void testPrimitiveShort(@ApiParam(value = "a short input") short input) {
   }
 
   @POST

modules/swagger-models/src/main/java/com/wordnik/swagger/models/ModelImpl.java

@@ -14,6 +14,7 @@
 public class ModelImpl extends AbstractModel {
   public static final String OBJECT = "object";
   private String type;
+  private String format;
   private String name;
   private List<String> required;
   private Map<String, Property> properties;
@@ -34,6 +35,11 @@ public ModelImpl type(String type) {
     return this;
   }
 
+  public ModelImpl format(String format) {
+    this.setFormat(format);
+    return this;
+  }
+
   public ModelImpl name(String name) {
     this.setName(name);
     return this;
@@ -108,6 +114,13 @@ public void setType(String type) {
     this.type = type;
   }
 
+  public String getFormat() {
+    return format;
+  }
+  public void setFormat(String format) {
+    this.format = format;
+  }
+
   public void addRequired(String name) {
     Property p = properties.get(name);
     if(p != null)