Merge branch '2.0' into branch_v2.0.1_Fix745

Author: ymohdriz

README.md

@@ -95,7 +95,7 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
 </dependency>
 
 ```
@@ -106,7 +106,7 @@ or
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
 </dependency>
 
 ```

modules/swagger-parser-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v2-converter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -80,6 +80,7 @@ public class SwaggerConverter implements SwaggerParserExtension {
     private List<String> globalConsumes = new ArrayList<>();
     private List<String> globalProduces = new ArrayList<>();
     private Components components = new Components();
+    private Map<String, io.swagger.models.parameters.Parameter> globalV2Parameters = new HashMap<>();
 
     @Override
     public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auths, ParseOptions options) {
@@ -115,6 +116,7 @@ public List<io.swagger.models.auth.AuthorizationValue> convert(List<Authorizatio
                 v.setType(auth.getType());
                 v.setValue(auth.getValue());
                 v.setKeyName(auth.getKeyName());
+                convertedAuth.add(v);
             }
         }
 
@@ -141,7 +143,9 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
             openAPI.setExternalDocs(convert(swagger.getExternalDocs()));
         }
 
-        openAPI.setInfo(convert(swagger.getInfo()));
+        if (swagger.getInfo() != null) {
+            openAPI.setInfo(convert(swagger.getInfo()));
+        }
 
         openAPI.setServers(convert(swagger.getSchemes(), swagger.getHost(), swagger.getBasePath()));
 
@@ -185,6 +189,7 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
         }
 
         if (swagger.getParameters() != null) {
+            globalV2Parameters.putAll(swagger.getParameters());
             swagger.getParameters().forEach((k, v) -> {
                 if ("body".equals(v.getIn())) {
                     components.addRequestBodies(k, convertParameterToRequestBody(v));
@@ -295,29 +300,35 @@ private SecurityScheme convertOauth2SecurityScheme(SecuritySchemeDefinition defi
         OAuthFlow oAuthFlow = new OAuthFlow();
 
         securityScheme.setType(SecurityScheme.Type.OAUTH2);
-
-        switch (oAuth2Definition.getFlow()) {
-            case "implicit":
-                oAuthFlow.setAuthorizationUrl(oAuth2Definition.getAuthorizationUrl());
-                oAuthFlows.setImplicit(oAuthFlow);
-                break;
-            case "password":
-                oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
-                oAuthFlows.setPassword(oAuthFlow);
-                break;
-            case "application":
-                oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
-                oAuthFlows.setClientCredentials(oAuthFlow);
-                break;
-            case "accessCode":
-                oAuthFlow.setAuthorizationUrl(oAuth2Definition.getAuthorizationUrl());
-                oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
-                oAuthFlows.setAuthorizationCode(oAuthFlow);
-                break;
+        String flow = oAuth2Definition.getFlow();
+
+        if (flow != null) {
+            switch (flow) {
+                case "implicit":
+                    oAuthFlow.setAuthorizationUrl(oAuth2Definition.getAuthorizationUrl());
+                    oAuthFlows.setImplicit(oAuthFlow);
+                    break;
+                case "password":
+                    oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
+                    oAuthFlows.setPassword(oAuthFlow);
+                    break;
+                case "application":
+                    oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
+                    oAuthFlows.setClientCredentials(oAuthFlow);
+                    break;
+                case "accessCode":
+                    oAuthFlow.setAuthorizationUrl(oAuth2Definition.getAuthorizationUrl());
+                    oAuthFlow.setTokenUrl(oAuth2Definition.getTokenUrl());
+                    oAuthFlows.setAuthorizationCode(oAuthFlow);
+                    break;
+            }
         }
 
         Scopes scopes = new Scopes();
-        oAuth2Definition.getScopes().forEach((k, v) -> scopes.addString(k, v));
+        Map<String, String> oAuth2Scopes = oAuth2Definition.getScopes();
+        if (oAuth2Scopes != null) {
+            oAuth2Scopes.forEach((k, v) -> scopes.addString(k, v));
+        }
         oAuthFlow.setScopes(scopes);
 
         securityScheme.setFlows(oAuthFlows);
@@ -508,6 +519,16 @@ public PathItem convert(Path v2Path) {
         return v3Path;
     }
 
+    private boolean isRefABodyParam(io.swagger.models.parameters.Parameter param) {
+        if (param instanceof RefParameter) {
+            RefParameter refParameter = (RefParameter) param;
+            String simpleRef = refParameter.getSimpleRef();
+            io.swagger.models.parameters.Parameter parameter = globalV2Parameters.get(simpleRef);
+            return "body".equals(parameter.getIn());
+        }
+        return false;
+    }
+
     public Operation convert(io.swagger.models.Operation v2Operation) {
         Operation operation = new Operation();
         if (StringUtils.isNotBlank(v2Operation.getDescription())) {
@@ -530,7 +551,14 @@ public Operation convert(io.swagger.models.Operation v2Operation) {
                 } else if ("body".equals(param.getIn())) {
                     operation.setRequestBody(convertParameterToRequestBody(param, v2Operation.getConsumes()));
                 } else {
-                    operation.addParametersItem(convert(param));
+                    Parameter convert = convert(param);
+                    String $ref = convert.get$ref();
+                    if ($ref != null && $ref.startsWith("#/components/requestBodies/") && isRefABodyParam(param)) {
+                        operation.setRequestBody(new RequestBody().$ref($ref));
+                    } else {
+                        operation.addParametersItem(convert);
+                    }
+                    //operation.addParametersItem(convert(param));
                 }
             }
 
@@ -810,6 +838,9 @@ private Header convertHeader(Property property) {
     }
 
     private Schema convert(Property schema) {
+        if (schema == null) {
+            return null;
+        }
         Schema result;
 
         if (schema instanceof RefProperty) {
@@ -1005,7 +1036,7 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
 
             if (sp.getEnum() != null) {
                 for (String e : sp.getEnum()) {
-                    switch (sp.getType()) {
+                    switch (sp.getType() == null ? SchemaTypeUtil.OBJECT_TYPE : sp.getType()) {
                         case SchemaTypeUtil.INTEGER_TYPE:
                             schema.addEnumItemObject(Integer.parseInt(e));
                             break;
@@ -1046,6 +1077,9 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
     }
 
     public Schema convert(io.swagger.models.Model v2Model) {
+        if (v2Model == null) {
+            return null;
+        }
         Schema result;
 
         if (v2Model instanceof ArrayModel) {
@@ -1056,11 +1090,15 @@ public Schema convert(io.swagger.models.Model v2Model) {
             result = arraySchema;
         } else if (v2Model instanceof ComposedModel) {
             ComposedModel composedModel = (ComposedModel) v2Model;
-
-            ComposedSchema composed = Json.mapper().convertValue(v2Model, ComposedSchema.class);
-
+            ComposedSchema composed = new ComposedSchema();
+            composed.setDescription(composedModel.getDescription());
+            composed.setExample(composedModel.getExample());
+            if (composedModel.getExternalDocs() != null) {
+                composed.setExternalDocs(convert(composedModel.getExternalDocs()));
+            }
+            composed.setTitle(composedModel.getTitle());
+            composed.setExtensions(convert(composedModel.getVendorExtensions()));
             composed.setAllOf(composedModel.getAllOf().stream().map(this::convert).collect(Collectors.toList()));
-
             result = composed;
         } else {
             String v2discriminator = null;

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

@@ -16,6 +16,7 @@
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.tags.Tag;
 import io.swagger.v3.parser.converter.SwaggerConverter;
+import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.parser.core.models.ParseOptions;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import org.testng.annotations.Test;
@@ -26,6 +27,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -78,6 +80,13 @@ public class V2ConverterTest {
     private static final String ISSUE_676_JSON = "issue-676.json";
     private static final String ISSUE_708_YAML = "issue-708.yaml";
     private static final String ISSUE_745_YAML = "issue-745.yaml";
+    private static final String ISSUE_755_YAML = "issue-755.yaml";
+    private static final String ISSUE_740_YAML = "issue-740.yaml";
+    private static final String ISSUE_756_JSON = "issue-756.json";
+    private static final String ISSUE_758_JSON = "issue-758.json";
+    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 API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -429,7 +438,7 @@ public void testIssue30() throws Exception {
         assertNotNull(oas);
     }
 
-    @Test(description = "No Servers - without host, basePath, scheme")
+    @Test(description = "Expect a default server object when a swagger without host, basePath and scheme is converted to openAPI")
     public void testIssue31() throws Exception {
         OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_31_JSON);
         assertNotNull(oas.getServers());
@@ -622,6 +631,52 @@ public void testIssue745() throws Exception {
         OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_745_YAML);
         assertTrue(oas.getServers().get(0).getUrl().startsWith("//"));
     }
+  
+    @Test(description = "OpenAPIParser.readLocation fails when fetching valid Swagger 2.0 resource with AuthorizationValues provided")
+    public void testIssue785() {
+        AuthorizationValue apiKey = new AuthorizationValue("api_key", "special-key", "header");
+        List<AuthorizationValue> authorizationValues = Arrays.asList(apiKey);
+        SwaggerConverter converter = new SwaggerConverter();
+        List<io.swagger.models.auth.AuthorizationValue> convertedAuthList = converter.convert(authorizationValues);
+        assertEquals(convertedAuthList.size(), authorizationValues.size());
+    }
+
+    @Test(description = "OpenAPI v2 converter - Migrate a schema with AllOf")
+    public void testIssue740() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_740_YAML);
+        assertNotNull(oas);
+        Schema schema = oas.getComponents().getSchemas().get("Action");
+        assertTrue(schema instanceof ComposedSchema);
+        ComposedSchema composedSchema = (ComposedSchema) schema;
+        assertEquals(composedSchema.getAllOf().size(), 2);
+    }
+
+    @Test(description = "OpenAPI v2 converter - no model in body parameter")
+    public void testIssue756() throws Exception {
+        OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_756_JSON);
+          assertNotNull(oas);
+    }
+
+    @Test(description = "OpenAPI v2 converter - NPE when 'enum' field is available and 'type' field is missing in query parameter")
+    public void testIssue758() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_758_JSON);
+        assertNotNull(oas);
+    }
+  
+    @Test(description = "OpenAPI v2 Converter: NPE when type is array and 'items' field is missing in array property")
+    public void testIssue762() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_762_JSON);
+        assertNotNull(oas);
+    } 
+  
+    @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);
+        assertNotNull(oas);
+        RequestBody requestBody = oas.getPaths().get("/ping/{ActivityTypePath}").getPost().getRequestBody();
+        assertNotNull(requestBody);
+        assertEquals("#/components/requestBodies/Block", requestBody.get$ref());
+    }
 
     @Test(description = "OpenAPI v2 converter - Missing Parameter.style property")
     public void testParameterConversion() throws Exception {
@@ -657,6 +712,20 @@ public void testSwaggerParseResultHasMessage() throws Exception {
         assertNotNull(result.getMessages());
     }
 
+    
+    @Test(description = "OpenAPI v2 converter - Migrate minLength, maxLength and pattern of String property")
+    public void testIssue786() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_768_JSON);
+        assertNotNull(oas);
+    }
+
+
+    @Test(description = "OpenAPI v2 converter - Conversion of a spec without a info section")
+    public void testIssue755() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_755_YAML);
+        assertNotNull(oas);
+    }
+
     private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException, URISyntaxException {
         SwaggerConverter converter = new SwaggerConverter();
         String swaggerAsString = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource(file).toURI())));

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

@@ -0,0 +1,66 @@
+swagger: '2.0'
+info:
+  description: 'Test'
+  version: 1.0.0
+  title: OpenAPI Test Issue 740
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+host: petstore.swagger.io
+basePath: /v2
+schemes:
+  - http
+paths:
+  /ping:
+    post:
+      summary: test
+      operationId: pingOperation
+      consumes:
+        - application/json
+      produces:
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          required: true
+          schema:
+            $ref: '#/definitions/Entity'
+      responses:
+        '200':
+          description: OK
+          schema:
+            $ref: '#/definitions/Action'
+definitions:
+  Entity:
+    type: "object"
+    properties:
+      id:
+        type: "string"
+        example: "1438752"
+        description: "The ID of the entity."
+        readOnly: true
+    title: "Entity"
+    description: "A base object for all API entities."
+  Action:
+    title: "Action"
+    allOf:
+    - $ref: "#/definitions/Entity"
+    - type: "object"
+      required:
+      - "action_type"
+      discriminator: "action_type"
+      properties:
+        name:
+          type: "string"
+          description: "The name of the action."
+          readOnly: true
+        action_type:
+          $ref: "#/definitions/ActionType"
+  ActionType:
+    type: "string"
+    title: "ActionType"
+    description: "Some enum"
+    enum:
+    - "value1"
+    - "value2"
+    x-swagger-router-model: "ActionTypeDto"