Merge pull request #1686 from swagger-api/issue1685

NPE when swagger field is invalid in 2.0 to 3.0 converter

Author: gracekarina

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

@@ -109,7 +109,7 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
 
     private SwaggerParseResult readResult(SwaggerDeserializationResult result, List<AuthorizationValue> auth, ParseOptions options) {
         SwaggerParseResult out = convert(result);
-        if (out != null && options != null) {
+        if (out != null && out.getOpenAPI() != null && options != null) {
             if (options.isResolveFully()) {
                 new ResolverFully(options.isResolveCombinators()).resolveFully(out.getOpenAPI());
             }

modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java

@@ -1,5 +1,6 @@
 package io.swagger.parser;
 
+import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
@@ -27,9 +28,19 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertNull;
 
 public class OpenAPIParserTest {
 
+    @Test
+    public void testNPE_1685() {
+        OpenAPIParser openAPIParser = new OpenAPIParser();
+        ParseOptions options = new ParseOptions();
+        options.setResolveFully(true);
+        SwaggerParseResult swaggerParseResult = openAPIParser.readLocation("issue1685.json", null, options);
+        assertNull(swaggerParseResult.getOpenAPI());
+    }
+
     @Test
     public void testIssue1608(){
         ParseOptions options = new ParseOptions();

modules/swagger-parser/src/test/resources/issue1685.json

@@ -0,0 +1,76 @@
+{
+  "notswagger": "x.0",
+  "info": {
+    "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+    "version": "1.0.5",
+    "title": "Swagger Petstore",
+    "termsOfService": "http://swagger.io/terms/",
+    "contact": {
+      "email": "[email protected]"
+    },
+    "license": {
+      "name": "Apache 2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/v2",
+  "schemes": [
+      "https",
+      "http"
+  ],
+  "paths": {
+    "/pet": {
+      "put": {
+        "summary": "Update an existing pet",
+        "description": "",
+        "operationId": "updatePet",
+        "consumes": [
+            "application/json",
+            "application/xml"
+        ],
+        "produces": [
+            "application/json",
+            "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet object that needs to be added to the store",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            }
+          }
+        ],
+        "responses": {
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Pet": {
+      "type": "object",
+      "required": [
+          "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "example": "doggie"
+        }
+      },
+      "xml": {
+        "name": "Pet"
+      }
+    }
+  },
+  "externalDocs": {
+    "description": "Find out more about Swagger",
+    "url": "http://swagger.io"
+  }
+}