Merge pull request #40 from swagger-api/issue-39

fix for #39
swagger-api · Aug 26, 2015 · e059921 · e059921
2 parents e4587c6 + 63a1a87
commit e059921
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 2 deletions.
diff --git a/src/main/java/io/swagger/inflector/SwaggerOperationController.java b/src/main/java/io/swagger/inflector/SwaggerOperationController.java
@@ -205,7 +205,7 @@ public Response apply(ContainerRequestContext ctx) {
                                         String key = kv[0];
                                         String value = kv[1];
                                         if (parameter.getName().equals(key)) {
-                                            JavaType jt = parameterClasses[i + 1];
+                                            JavaType jt = parameterClasses[i];
                                             Class<?> cls = jt.getRawClass();
                                             try {
                                                 o = validator.convertAndValidate(Arrays.asList(value), parameter, cls, definitions);

diff --git a/src/test/java/io/swagger/sample/controllers/TestController.java b/src/test/java/io/swagger/sample/controllers/TestController.java
@@ -27,6 +27,14 @@
 import javax.ws.rs.core.Response.Status;
 
 public class TestController {
+    public ResponseContext formTest(RequestContext request, String user) {
+      System.out.println("found it! " + user);
+        return new ResponseContext()
+            .status(Status.OK)
+            .contentType(MediaType.APPLICATION_JSON_TYPE)
+            .entity(user);
+    }
+
     public ResponseContext postFormData(RequestContext request, Long id, String name) {
         // show a sample response
         return new ResponseContext()

diff --git a/src/test/java/io/swagger/test/integration/RequestTestIT.java b/src/test/java/io/swagger/test/integration/RequestTestIT.java
@@ -17,7 +17,6 @@
 package io.swagger.test.integration;
 
 import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
 import org.testng.annotations.Test;
 
 import io.swagger.test.client.ApiClient;
@@ -26,6 +25,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
 import static org.testng.Assert.*;
 
 public class RequestTestIT {
@@ -51,4 +54,25 @@ public void verifyModelMappingFromExtensions() throws Exception {
         String str = client.invokeAPI(path, "POST", new HashMap<String, String>(), null, new HashMap<String, String>(), null, "application/json", null, new String[0]);
         assertEquals(str, "ok");
     }
+
+    @Test
+    public void verifyPostFormData() throws Exception {
+        String path = "/formTest";
+
+        MultivaluedMap<String, String> formData = new MultivaluedHashMap<String, String>();
+        formData.add("user", "tony");
+
+        String str = client.invokeAPI(
+            path,               // path
+            "POST",             // method
+            new HashMap<String, String>(),  // query
+            null,               // body
+            new HashMap<String, String>(), // header
+            Entity.form(formData),         // form
+            "application/json", // accept
+            "x-www-form-urlencoded",  // contentType
+            new String[0]);
+
+        assertEquals(str, "tony");
+    }
 }
diff --git a/src/test/swagger/sample1.yaml b/src/test/swagger/sample1.yaml
@@ -16,6 +16,22 @@ info:
 basePath: /api
 
 paths:
+  /formTest:
+    post:
+      operationId: formTest
+      x-swagger-router-controller: TestController
+      tags:
+        - formTest
+      consumes:
+        - x-www-form-urlencoded
+      parameters:
+        - name: user
+          in: formData
+          required: true
+          type: string
+      responses:
+        '200':
+          description: 'success!'
   /mockResponses:
     get:
       tags: