Merge pull request #852 from brightcove/fix-npe-no-content-api-response

Fix NullPointerException when resolving an ApiResponse with no content

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/ResolverCache.java

@@ -159,8 +159,10 @@ else if(rootPath != null) {
     protected <T> void updateLocalRefs(String file, T result) {
         if(result instanceof ApiResponse) {
             ApiResponse response = (ApiResponse) result;
-            for(String mediaType : response.getContent().keySet()) {
-                updateLocalRefs(file, response.getContent().get(mediaType).getSchema());
+            if (response.getContent() != null) {
+                for (String mediaType : response.getContent().keySet()) {
+                    updateLocalRefs(file, response.getContent().get(mediaType).getSchema());
+                }
             }
         }
         if(result instanceof Schema && ((Schema)(result)).get$ref() != null) {

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/ResolverCacheTest.java

@@ -36,8 +36,6 @@ public class ResolverCacheTest {
     @Mocked
     RefUtils refUtils;
 
-    @Mocked
-    DeserializationUtils deserializationUtils;
 
     @Injectable
     OpenAPI openAPI;
@@ -50,7 +48,7 @@ public void testMock(@Injectable final Schema expectedResult) throws Exception {
         final String ref = "http://my.company.com/path/to/file.json";
         final String contentsOfExternalFile = "really good json";
 
-        new Expectations() {{
+        new Expectations(DeserializationUtils.class) {{
             RefUtils.readExternalUrlRef(ref, format, auths, "http://my.company.com/path/parent.json");
             times = 1;
             result = contentsOfExternalFile;
@@ -75,7 +73,7 @@ public void testLoadExternalRef_NoDefinitionPath(@Injectable final Schema expect
         final String ref = "http://my.company.com/path/to/file.json";
         final String contentsOfExternalFile = "really good json";
 
-        new Expectations() {{
+        new Expectations(DeserializationUtils.class) {{
             RefUtils.readExternalUrlRef(ref, format, auths, "http://my.company.com/path/parent.json");
             times = 1;
             result = contentsOfExternalFile;
@@ -128,6 +126,35 @@ public void testLoadExternalRefWithEscapedCharacters() throws Exception {
         assertNotNull(path);
     }
 
+    @Test
+    public void testLoadExternalRefResponseWithNoContent() throws Exception {
+        final RefFormat format = RefFormat.URL;
+        final String ref = "http://my.company.com/path/to/main.yaml";
+        final String contentsOfExternalFile = "openapi: 3.0.0\n" +
+          "\n" +
+          "info:\n" +
+          "  version: 1.0.0\n" +
+          "  title: Response include test case child\n" +
+          "\n" +
+          "components:\n" +
+          "  responses:\n" +
+          "    200:\n" +
+          "      description: Success\n";
+
+        new Expectations() {{
+            RefUtils.readExternalUrlRef(ref, format, auths, "http://my.company.com/path/parent.json");
+            times = 1;
+            result = contentsOfExternalFile;
+        }};
+
+        ResolverCache cache = new ResolverCache(openAPI, auths, "http://my.company.com/path/parent.json");
+
+        ApiResponse response = cache.loadRef(ref+"#/components/responses/200", RefFormat.URL, ApiResponse.class);
+        assertNotNull(response);
+        assertEquals(response.getDescription(), "Success");
+        assertNull(response.getContent());
+    }
+
     @Test
     public void testLoadInternalParameterRef(@Injectable Parameter mockedParameter) throws Exception {
         OpenAPI openAPI = new OpenAPI();