Merge remote-tracking branch 'origin/2.0' into 2.0-OpenAPITools

Author: jmini

modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java

@@ -659,11 +659,17 @@ private RequestBody convertFormDataToRequestBody(List<io.swagger.models.paramete
             schema.setMinLength(sp.getMinLength());
             schema.setMaxLength(sp.getMaxLength());
 
-            Object exampleExtension = sp.getVendorExtensions().get("x-example");
-            if (exampleExtension != null) {
-                schema.setExample(exampleExtension);
+            if (sp.getVendorExtensions() != null) {
+                Object exampleExtension = sp.getVendorExtensions().get("x-example");
+                if (exampleExtension != null) {
+                    schema.setExample(exampleExtension);
+                }
+                Object nullableExtension = sp.getVendorExtensions().get("x-nullable");
+                if (nullableExtension != null) {
+                    schema.setNullable((Boolean) nullableExtension);
+                }
+                schema.setExtensions(convert(sp.getVendorExtensions()));
             }
-            schema.setExtensions(convert(sp.getVendorExtensions()));
 
             if (sp.getMultipleOf() != null) {
                 schema.setMultipleOf(new BigDecimal(sp.getMultipleOf().toString()));

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

@@ -88,6 +88,7 @@ public class V2ConverterTest {
     private static final String ISSUE_762_JSON = "issue-762.json";
     private static final String ISSUE_765_YAML = "issue-765.yaml";
     private static final String ISSUE_768_JSON = "issue-786.json";
+    private static final String ISSUE_820_YAML = "issue-820.yaml";
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -724,6 +725,33 @@ public void testIssue755() throws Exception {
         final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_755_YAML);
         assertNotNull(oas);
     }
+    
+    @Test(description = "OpenAPI v2 converter - Conversion param extensions should be preserved")
+    public void testIssue820() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_820_YAML);
+        assertNotNull(oas);
+        Operation post = oas.getPaths().get("/issue820").getPost();
+        assertNotNull(post.getRequestBody().getContent().get("multipart/form-data"));
+        assertNotNull(post.getRequestBody().getContent().get("multipart/form-data").getSchema());
+        Map<String, Schema> properties = post.getRequestBody().getContent().get("multipart/form-data").getSchema().getProperties();
+        assertNotNull(properties);
+        assertEquals(properties.size(), 3, "size");
+        Schema foo = properties.get("foo");
+        assertNotNull(foo);
+        assertNotNull(foo.getExtensions());
+        assertEquals(foo.getExtensions().get("x-ext"), "some foo");
+        assertEquals(foo.getNullable(), null);
+        Schema bar = properties.get("bar");
+        assertNotNull(bar);
+        assertNotNull(bar.getExtensions());
+        assertEquals(bar.getExtensions().get("x-ext"), "some bar");
+        assertEquals(bar.getNullable(), Boolean.TRUE);
+        Schema baz = properties.get("baz");
+        assertNotNull(baz);
+        assertNotNull(baz.getExtensions());
+        assertEquals(baz.getExtensions().get("x-ext"), "some baz");
+        assertEquals(baz.getNullable(), Boolean.FALSE);
+    }
 
     private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException, URISyntaxException {
         SwaggerConverter converter = new SwaggerConverter();

modules/swagger-parser-v2-converter/src/test/resources/issue-820.yaml

@@ -0,0 +1,33 @@
+swagger: "2.0"
+info:
+  version: "1.0.1"
+  title: "Test for issue 820"
+basePath: "/v1"
+paths:
+  /issue820:
+    post:
+      operationId: "issue820"
+      parameters:
+        - name: foo
+          in: formData
+          description: some foo param
+          required: false
+          type: string
+          x-ext: some foo
+        - name: bar
+          in: formData
+          description: some bar param
+          required: true
+          type: integer
+          x-nullable: true
+          x-ext: some bar
+        - name: baz
+          in: formData
+          description: some baz param
+          required: true
+          type: integer
+          x-nullable: false
+          x-ext: some baz
+      responses:
+        200:
+          description: "success"