Merge pull request #1353 from kerrykimbrough/issue-1352

ResolverFully: Ensure any header schema $ref is resolved

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/ResolverFully.java

@@ -217,6 +217,13 @@ private void resolveHeaders(Map<String, Header> headers) {
                 Map<String,Example> resolved = resolveExample(examples);
                 resolvedValue.setExamples(resolved);
             }
+            Schema schema = resolvedValue.getSchema();
+            if(schema != null) {
+                Schema resolvedSchema = resolveSchema( schema);
+                if(resolvedSchema != null) {
+                    resolvedValue.setSchema( resolvedSchema);
+                }
+            }
             header.setValue(resolvedValue);
         }
     }

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

@@ -492,6 +492,17 @@ public void testIssue85(@Injectable final List<AuthorizationValue> auths) {
         assertTrue(prop instanceof Schema);
     }
 
+    @Test
+    public void testIssue1352(@Injectable final List<AuthorizationValue> auths) {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setResolveFully(true);
+
+        OpenAPI openAPI= new OpenAPIV3Parser().readLocation("issue-1352.json", auths, options).getOpenAPI();
+        assertNull(openAPI.getPaths().get("/responses").getPatch().getResponses().get("200").getHeaders().get("x-my-secret-header").getSchema().get$ref());
+
+    }
+
     @Test
     public void testIssue1157(@Injectable final List<AuthorizationValue> auths) {
         ParseOptions options = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/issue-1352.json

@@ -0,0 +1,82 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Responses",
+    "version": "0.0.0"
+  },
+  "paths": {
+    "/responses": {
+      "patch": {
+        "responses": {
+          "200": {
+            "description": "It's a secret",
+            "headers": {
+              "x-my-secret-header": {
+                "required": true,
+                "schema": {
+                  "$ref": "#/components/schemas/secrets"
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "maxProperties": 1,
+                  "additionalProperties": {
+                    "type": "number"
+                  }
+                }
+              },
+              "text/javascript": {
+                "schema": {
+                  "type": "object",
+                  "minProperties": 1,
+                  "additionalProperties": {
+                    "type": "boolean"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "$ref": "#/components/responses/failure"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "responses": {
+      "success": {
+        "description": "Success",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/successContent"
+            }
+          }
+        }
+      },
+      "failure": {
+        "description": "Error",
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      }
+    },
+    "schemas": {
+      "secrets": {
+        "type": "array",
+        "items": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    }
+  }
+}