Merge pull request #854 from JehandadK/issue-853-OAS3

Issue #853 oas3

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/PathsProcessor.java

@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.callbacks.Callback;
+import io.swagger.v3.oas.models.examples.Example;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.MediaType;
@@ -168,6 +169,20 @@ protected void updateLocalRefs(ApiResponse response, String pathRef) {
                 if (mediaType.getSchema() != null) {
                     updateLocalRefs(mediaType.getSchema(), pathRef);
                 }
+                Map<String, Example> examples = content.get(key).getExamples();
+                if (examples != null) {
+                    for( Example example:examples.values()){
+                        updateLocalRefs(example, pathRef);
+                    }
+                }
+            }
+        }
+    }
+
+    protected void updateLocalRefs(Example example, String pathRef) {
+        if(example.get$ref() != null) {
+            if(isLocalRef(example.get$ref())) {
+                example.set$ref(computeLocalRef(example.get$ref(), pathRef));
             }
         }
     }

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

@@ -44,12 +44,7 @@
 import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.testng.Assert.*;
@@ -60,11 +55,35 @@ public class OpenAPIV3ParserTest {
     protected WireMockServer wireMockServer;
 
 
+    @Test
+    public void testIssue853() {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setFlatten(true);
+        final OpenAPI openAPI = new OpenAPIV3Parser().readLocation("issue-837-853/main.yaml", null, options).getOpenAPI();
+
+        Assert.assertNotNull(openAPI);
+
+        Operation post = openAPI.getPaths().get("/guests").getPost();
+        Assert.assertNotNull(post);
+
+        Content content = post.getResponses().get("201").getContent();
+        Assert.assertNotNull(content);
+
+        Map<String, Example> examples = content.get("application/json").getExamples();
+        Assert.assertEquals(examples.size(), 1);
+        assertNotNull(openAPI.getComponents());
+        assertNotNull(openAPI.getComponents().getExamples());
+        assertNotNull(openAPI.getComponents().getExamples().get("testExample"));
+        assertEquals(((LinkedHashMap<String, Object>)openAPI.getComponents().getExamples().get("testExample").getValue()).get("test"),"value");
+
+    }
+
     @Test
     public void testIssue837() {
         ParseOptions options = new ParseOptions();
         options.setResolve(true);
-        final OpenAPI openAPI = new OpenAPIV3Parser().readLocation("./issue837/main.yaml", null, options).getOpenAPI();
+        final OpenAPI openAPI = new OpenAPIV3Parser().readLocation("issue-837-853/main.yaml", null, options).getOpenAPI();
 
         Assert.assertNotNull(openAPI);
 

modules/swagger-parser-v3/src/test/resources/issue837/components.yaml renamed to modules/swagger-parser-v3/src/test/resources/issue-837-853/components.yaml

@@ -0,0 +1,22 @@
+post:
+  description: add a guest
+  operationId: addGuest
+  responses:
+    '201':
+      description: New guest added to event list
+      content:
+        application/json:
+          schema:
+            properties:
+              test:
+                type: string
+          examples:
+            testExample:
+              $ref: '#/components/examples/testExample'
+components:
+  examples:
+    testExample:
+      value:
+        test: value
+
+

modules/swagger-parser-v3/src/test/resources/issue-837-853/external-operation.yaml

@@ -29,7 +29,10 @@ paths:
                 local:
                   $ref: '#/components/examples/LocalRef'
                 external:
-                  $ref: './issue837/components.yaml#/components/examples/ExternalRef'
+                  $ref: './issue-837-853/components.yaml#/components/examples/ExternalRef'
+  /guests:
+    $ref: './issue-837-853/external-operation.yaml'
+
 components:
   examples:
     LocalRef: