Merge branch 'master' into master

Author: gracekarina

README.md

@@ -111,7 +111,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.1.0</version>
+  <version>2.1.1</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.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-core/src/main/java/io/swagger/v3/parser/core/models/ParseOptions.java

@@ -15,7 +15,7 @@ public class ParseOptions {
     private boolean resolveRequestBody = false;
 
     private boolean oaiAuthor;
-    private boolean defaultSchemaTypeObject = true;
+    private boolean inferSchemaType = true;
 
     public boolean isResolve() {
         return resolve;
@@ -124,11 +124,11 @@ public boolean isValidateInternalRefs() {
         return validateInternalRefs;
     }
 
-    public boolean isDefaultSchemaTypeObject() {
-        return defaultSchemaTypeObject;
+    public boolean isInferSchemaType() {
+        return inferSchemaType;
     }
 
-    public void setDefaultSchemaTypeObject(boolean defaultSchemaTypeObject) {
-        this.defaultSchemaTypeObject = defaultSchemaTypeObject;
+    public void setInferSchemaType(boolean inferSchemaType) {
+        this.inferSchemaType = inferSchemaType;
     }
 }

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.1.1-SNAPSHOT</version>
+        <version>2.1.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

@@ -646,7 +646,7 @@ public Operation convert(io.swagger.models.Operation v2Operation) {
             operation.setExternalDocs(convert(v2Operation.getExternalDocs()));
         }
 
-        if (v2Operation.getSecurity() != null && v2Operation.getSecurity().size() > 0) {
+        if (v2Operation.getSecurity() != null) {
             operation.setSecurity(convertSecurityRequirementsMap(v2Operation.getSecurity()));
         }
 

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

@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.security.OAuthFlow;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.tags.Tag;
 import io.swagger.v3.parser.converter.SwaggerConverter;
@@ -94,6 +95,8 @@ public class V2ConverterTest {
 
     private static final String ISSUE_1715_YAML = "issue-1715.yaml";
 
+    private static final String ISSUE_1767_YAML = "issue-1767.yaml";
+
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
     private static final String PET_FIND_BY_STATUS_PATH = "/pet/findByStatus";
@@ -859,6 +862,21 @@ public void testissue1715() throws Exception {
         assertEquals("bar", requestBody.getExtensions().get("x-foo"));
     }
 
+    @Test(description = "OpenAPI v2 converter - security of operation should be set to empty list if that's the case")
+    public void testIssue1767() throws Exception {
+        OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1767_YAML);
+        assertNotNull(oas);
+
+        List<SecurityRequirement> firstOperationSecurityRequirements =
+                oas.getPaths().get("/api/not-secured").getGet().getSecurity();
+        assertNotNull(firstOperationSecurityRequirements);
+        assertEquals(firstOperationSecurityRequirements.size(), 0);
+
+        List<SecurityRequirement> secondOperationSecurityRequirements =
+                oas.getPaths().get("/api/secured/").getGet().getSecurity();
+        assertNull(secondOperationSecurityRequirements);
+    }
+
     @Test()
     public void testInlineDefinitionProperty() throws Exception {
         SwaggerConverter converter = new SwaggerConverter();

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

@@ -0,0 +1,41 @@
+swagger: '2.0'
+basePath: /
+paths:
+  /api/not-secured:
+    get:
+      responses:
+        '200':
+          description: Success
+      summary: Not secured API
+      operationId: not_secured_api
+      security: []
+      tags:
+        - not-secured
+  /api/secured/:
+    get:
+      responses:
+        '200':
+          description: Success
+      summary: Secured API
+      operationId: secured_api
+      tags:
+        - secured
+info:
+  title: Sample spec
+  version: 0.1.0
+produces:
+  - application/json
+consumes:
+  - application/json
+securityDefinitions:
+  api_key:
+    type: apiKey
+    in: header
+    name: Authorization
+security:
+  - api_key: []
+tags:
+  - name: not-secured
+    description: API not secured
+  - name: secured
+    description: API secured

modules/swagger-parser-v3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -64,6 +64,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j-version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/extensions/JsonSchemaParserExtension.java

@@ -1,6 +1,6 @@
 package io.swagger.v3.parser.extensions;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.ResolverCache;
@@ -10,7 +10,7 @@
 
 public interface JsonSchemaParserExtension {
 
-    Schema getSchema(ObjectNode node, String location, OpenAPIDeserializer.ParseResult result, Map<String, Object> rootMap, String basePath);
+    Schema getSchema(JsonNode node, String location, OpenAPIDeserializer.ParseResult result, Map<String, Object> rootMap, String basePath);
 
 
     boolean resolveSchema(Schema schema, ResolverCache cache, OpenAPI openAPI, boolean openapi31);