Merge pull request #967 from OpenAPITools/preserve-body-parameter-name

Ensure the body parameter name is preserved

Author: gracekarina

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

@@ -574,6 +574,7 @@ public Operation convert(io.swagger.models.Operation v2Operation) {
         }
         operation.setDeprecated(v2Operation.isDeprecated());
         operation.setOperationId(v2Operation.getOperationId());
+        operation.setExtensions(convert(v2Operation.getVendorExtensions()));
 
         operation.setTags(v2Operation.getTags());
 
@@ -585,6 +586,7 @@ public Operation convert(io.swagger.models.Operation v2Operation) {
                     formParams.add(param);
                 } else if ("body".equals(param.getIn())) {
                     operation.setRequestBody(convertParameterToRequestBody(param, v2Operation.getConsumes()));
+                    operation.addExtension("x-codegen-request-body-name", param.getName());
                 } else {
                     Parameter convert = convert(param);
                     String $ref = convert.get$ref();
@@ -631,8 +633,6 @@ public Operation convert(io.swagger.models.Operation v2Operation) {
             operation.setSecurity(convertSecurityRequirementsMap(v2Operation.getSecurity()));
         }
 
-        operation.setExtensions(convert(v2Operation.getVendorExtensions()));
-
         return operation;
     }
 

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

@@ -678,8 +678,15 @@ public void testIssue758() throws Exception {
     public void testIssue762() throws Exception {
         final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_762_JSON);
         assertNotNull(oas);
-    } 
-  
+    }
+
+    @Test(description = "OpenAPI v2 Converter: Ensure body name is preserved in x-codegen-request-body-name extension")
+    public void testPreserveBodyParameterName() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_762_JSON);
+        assertNotNull(oas);
+        assertEquals(oas.getPaths().get("/").getPut().getExtensions().get("x-codegen-request-body-name"), "pet");
+    }
+
     @Test(description = "requestBody not correctly populated when Parameters is a list of $refs (OAS 2 to 3 conversion)")
     public void testIssue765() throws Exception {
         final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_765_YAML);