Merge pull request #2 from swagger-api/master

r-sreesaran · web-flow · commit 64150eb3b020 · 2019-10-08T23:56:49.000+05:30
latest changes
diff --git a/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java b/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;
     }
 
diff --git a/modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java b/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);
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java
@@ -183,12 +183,12 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                 if(options != null) {
                     if (options.isResolve()) {
                         OpenAPIDeserializer deserializer = new OpenAPIDeserializer();
-                        JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
+                        JsonNode rootNode = mapper.readTree(swaggerAsString);
                         result = deserializer.deserialize(rootNode);
                         OpenAPIResolver resolver = new OpenAPIResolver(result.getOpenAPI(), auth, null);
                         result.setOpenAPI(resolver.resolve());
                     }else{
-                        JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
+                        JsonNode rootNode = mapper.readTree(swaggerAsString);
                         result = new OpenAPIDeserializer().deserialize(rootNode);
                     }
                     if (options.isResolveFully()) {
@@ -200,7 +200,7 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                         inlineModelResolver.flatten(result.getOpenAPI());
                     }
                 }else{
-                    JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
+                    JsonNode rootNode = mapper.readTree(swaggerAsString);
                     result = new OpenAPIDeserializer().deserialize(rootNode);
                 }
             } catch (Exception e) {
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
@@ -1958,9 +1958,9 @@ public OAuthFlow getOAuthFlow(String oAuthFlowType, ObjectNode node, String loca
             JsonNode scopeValue = scopesObject.get(name);
             if (scopesObject!= null){
                 scope.addString(name,scopeValue.asText());
-                oAuthFlow.setScopes(scope);
             }
         }
+        oAuthFlow.setScopes(scope);
 
         Map <String,Object> extensions = getExtensions(node);
         if(extensions != null && extensions.size() > 0) {
@@ -2100,10 +2100,12 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
             : additionalPropertiesBoolean;
 
         if(additionalProperties != null) {
-            schema =
-                additionalProperties.equals( Boolean.FALSE)
-                ? new ObjectSchema()
-                : new MapSchema();
+            if (schema == null) {
+                schema =
+                        additionalProperties.equals(Boolean.FALSE)
+                                ? new ObjectSchema()
+                                : new MapSchema();
+            }
             schema.setAdditionalProperties( additionalProperties);
         }
 
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java
@@ -66,6 +66,20 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1190() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setFlatten(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation("issue1190/issue1190.yaml", null, options);
+
+        OpenAPI openAPI = parseResult.getOpenAPI();
+        assertNotNull(openAPI.getComponents().getSchemas().get("SomeObj_lorem"));
+    }
+
+
+
     @Test
     public void testIssue1147() {
         ParseOptions options = new ParseOptions();
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/InlineModelResolverTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/InlineModelResolverTest.java
@@ -1337,4 +1337,17 @@ public void testArbitraryObjectModelWithArrayInlineWithTitle() {
         ObjectSchema op = (ObjectSchema) inlineProp;
         assertNull(op.getProperties());
     }
-}
+
+
+    @Test(description = "https://github.com/swagger-api/swagger-parser/issues/1200")
+    public void testInlineItemsSchema() throws Exception {
+        ParseOptions options = new ParseOptions();
+        options.setFlatten(true);
+        OpenAPI openAPI = new OpenAPIV3Parser().read("flatten.json",null, options);
+
+        System.out.println(openAPI);
+
+        assertNotNull(openAPI);
+        assertNotNull(openAPI.getComponents().getSchemas().get("inline_response_200"));
+    }
+}
diff --git a/modules/swagger-parser-v3/src/test/resources/flatten.json b/modules/swagger-parser-v3/src/test/resources/flatten.json
@@ -1,5 +1,59 @@
 {
   "openapi" : "3.0.1",
+  "paths" : {
+    "/employees" : {
+      "get" : {
+        "description" : "Obtain information about employees from HR database",
+        "parameters" : [ {
+          "name" : "bodylimit",
+          "in" : "query",
+          "schema" : {
+            "type" : "integer",
+            "minimum" : 10,
+            "maximum" : 20,
+            "example" : 8
+          }
+        }, {
+          "name" : "pagelimit",
+          "in" : "query",
+          "schema" : {
+            "type" : "integer",
+            "minimum" : 1,
+            "maximum" : 5,
+            "example" : 2
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successully returned number of employees",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "type" : "array",
+                  "items" : {
+                    "properties" : {
+                      "id" : {
+                        "type" : "integer",
+                        "example" : 4
+                      },
+                      "employee name" : {
+                        "type" : "string",
+                        "example" : "vijay"
+                      },
+                      "employee title" : {
+                        "type" : "string",
+                        "example" : "QA"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   "components" : {
     "schemas" : {
       "ReturnInformation": {
@@ -47,4 +101,4 @@
       }
     }
   }
-}
+}
diff --git a/modules/swagger-parser-v3/src/test/resources/issue1190/issue1190.yaml b/modules/swagger-parser-v3/src/test/resources/issue1190/issue1190.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Issue 1190
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+paths:
+  /example:
+    get:
+      operationId: example
+      responses:
+        '200':
+          description: successful operation
+          content:
+            'application/json':
+              schema:
+                $ref: "#/components/schemas/SomeObj"
+components:
+  schemas:
+    SomeObj:
+      type: object
+      properties:
+        lorem:
+          type: array
+          minItems: 1
+          additionalProperties: false
+          items:
+            type: object
+            properties:
+              firstName:
+                type: string
+              lastName:
+                type: string
diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.PathItem;
 
@@ -538,6 +539,17 @@ public void testIssue1003_ExtensionsClassloader() {
         }
         assertNotNull(api);
     }
+
+    @Test
+    public void testIssue1086() {
+        OpenAPIParser openApiParser = new OpenAPIParser();
+        ParseOptions options = new ParseOptions();
+        OpenAPI openAPI = openApiParser.readLocation("issue1086.yaml", null, options).getOpenAPI();
+        Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
+        ObjectSchema schema = (ObjectSchema) schemas.get("AssessCandidate").getProperties().get("test_results");
+        Schema score = schema.getProperties().get("score");
+        assertEquals(score.getMultipleOf().intValue(), 1);
+    }
   
 }
 
diff --git a/modules/swagger-parser/src/test/resources/issue1086.yaml b/modules/swagger-parser/src/test/resources/issue1086.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.0
+info:
+  version: 0.0.0
+  title: "test"
+components:
+  schemas:
+    AssessCandidate:
+      type: object
+      properties:
+        candidate:
+          type: object
+          properties:
+            id:
+              type: string
+          required:
+            - id
+        test_results:
+          type: object
+          properties:
+            id:
+              type: string
+            status:
+              type: string
+            score:
+              type: number
+              multipleOf: 1
+            date:
+              type: string
+              format: date
+            comment:
+              type: string
+            result_url:
+              type: string
+      required:
+        - candidate
+        - test_results
diff --git a/pom.xml b/pom.xml
@@ -295,7 +295,7 @@
         <wiremock-version>2.15.0</wiremock-version>
         <surefire-version>2.21.0</surefire-version>
         <commons-lang-version>3.2.1</commons-lang-version>
-        <jackson-version>2.9.9</jackson-version>
+        <jackson-version>2.9.10</jackson-version>
     </properties>
     
 </project>

Original file line number	Diff line number	Diff line change
`@@ -574,6 +574,7 @@ public Operation convert(io.swagger.models.Operation v2Operation) {`
`574`	`574`	`}`
`575`	`575`	`operation.setDeprecated(v2Operation.isDeprecated());`
`576`	`576`	`operation.setOperationId(v2Operation.getOperationId());`
	`577`	`+ operation.setExtensions(convert(v2Operation.getVendorExtensions()));`
`577`	`578`
`578`	`579`	`operation.setTags(v2Operation.getTags());`
`579`	`580`
`@@ -585,6 +586,7 @@ public Operation convert(io.swagger.models.Operation v2Operation) {`
`585`	`586`	`formParams.add(param);`
`586`	`587`	`} else if ("body".equals(param.getIn())) {`
`587`	`588`	`operation.setRequestBody(convertParameterToRequestBody(param, v2Operation.getConsumes()));`
	`589`	`+ operation.addExtension("x-codegen-request-body-name", param.getName());`
`588`	`590`	`} else {`
`589`	`591`	`Parameter convert = convert(param);`
`590`	`592`	`String $ref = convert.get$ref();`
`@@ -631,8 +633,6 @@ public Operation convert(io.swagger.models.Operation v2Operation) {`
`631`	`633`	`operation.setSecurity(convertSecurityRequirementsMap(v2Operation.getSecurity()));`
`632`	`634`	`}`
`633`	`635`
`634`		`- operation.setExtensions(convert(v2Operation.getVendorExtensions()));`
`635`		`-`
`636`	`636`	`return operation;`
`637`	`637`	`}`
`638`	`638`