Merge pull request #937 from ymohdriz/branch_issue_800

Fix for issue 936

Author: gracekarina

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

@@ -187,19 +187,7 @@ public void resolvePath(PathItem pathItem){
                         }
                     }
 
-                    Map<String, Header> headers = response.getHeaders();
-                    if (headers != null) {
-                        for (Map.Entry<String, Header> header : headers.entrySet()) {
-                            Header value = header.getValue();
-                            Header resolvedValue = value.get$ref() != null ? resolveHeader(value) : value;
-                            Map<String, Example> examples = resolvedValue.getExamples();
-                            if(examples != null) {
-                                Map<String,Example> resolved = resolveExample(examples);
-                                resolvedValue.setExamples(resolved);
-                            }
-                            header.setValue(resolvedValue);
-                        }
-                    }  
+                    resolveHeaders(response.getHeaders());
 
                     Map<String, Link> links = response.getLinks();
                     if (links != null) {
@@ -214,6 +202,22 @@ public void resolvePath(PathItem pathItem){
         }
     }
 
+    private void resolveHeaders(Map<String, Header> headers) {
+        if (headers == null || headers.isEmpty()) {
+            return;
+        }
+        for (Map.Entry<String, Header> header : headers.entrySet()) {
+            Header value = header.getValue();
+            Header resolvedValue = value.get$ref() != null ? resolveHeader(value) : value;
+            Map<String, Example> examples = resolvedValue.getExamples();
+            if(examples != null) {
+                Map<String,Example> resolved = resolveExample(examples);
+                resolvedValue.setExamples(resolved);
+            }
+            header.setValue(resolvedValue);
+        }
+    }
+
     public Header resolveHeader(Header header){
         RefFormat refFormat = computeRefFormat(header.get$ref());
         String $ref = header.get$ref();
@@ -232,7 +236,12 @@ public Link resolveLink(Link link){
         if (!isAnExternalRefFormat(refFormat)){
             if (links != null && !links.isEmpty()) {
                 String referenceKey = computeDefinitionName($ref);
-                return links.getOrDefault(referenceKey, link);
+                Link link1 = links.getOrDefault(referenceKey, link);
+                if (link1 == null) {
+                    return null;
+                }
+                resolveHeaders(link1.getHeaders());
+                return link1;
             }
         }
         return link;

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

@@ -1613,8 +1613,10 @@ public void testIssue884() {
         parseOptions.setResolveFully(true);
         OpenAPI openAPI = new OpenAPIV3Parser().read("src/test/resources/issue_884.yaml", null, parseOptions);
         Map<String, Link> links = openAPI.getPaths().get("/2.0/repositories/{username}").getGet().getResponses().get("200").getLinks();
-        String operationId = links.get("userRepository").getOperationId();
+        Link userRepository = links.get("userRepository");
+        String operationId = userRepository.getOperationId();
         assertEquals(operationId, "getRepository");
+        assertNotNull(userRepository.getHeaders());
     }
 
     @Test

modules/swagger-parser-v3/src/test/resources/issue_884.yaml

@@ -50,6 +50,11 @@ components:
     userRepository:
       operationId: getRepository
       requestBody: '$response.body#/slug'
+      headers:
+        X-Rate-Limit:
+          description: The number of allowed requests in the current period
+          schema:
+            type: integer
   schemas:
     user:
       type: object