Merge pull request #858 from ymohdriz/branch_fix855

Fix for issue 855

Author: gracekarina

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

@@ -124,6 +124,7 @@ public void resolvePath(PathItem pathItem){
             RequestBody refRequestBody = op.getRequestBody();
             if (refRequestBody != null){
                 RequestBody requestBody = refRequestBody.get$ref() != null ? resolveRequestBody(refRequestBody) : refRequestBody;
+                op.setRequestBody(requestBody);
                 if (requestBody.getContent() != null) {
                     Map<String, MediaType> content = requestBody.getContent();
                     for (String key : content.keySet()) {

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

@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.oas.models.examples.Example;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ByteArraySchema;
@@ -1522,6 +1523,20 @@ public void readingSpecNodeShouldNotOverQuotingStringExample() throws Exception
         assertEquals("NoQuotePlease", definitions.get("CustomerType").getExample());
     }
 
+    @Test(description = "Issue 855: Request Body internal refs are not being resolved")
+    public void shouldParseRequestBody() {
+        ParseOptions parseOptions = new ParseOptions();
+        parseOptions.setResolveFully(true);
+        OpenAPI openAPI = new OpenAPIV3Parser().read("src/test/resources/issue_855.yaml", null, parseOptions);
+        Content actualComponentContent = openAPI.getComponents().getRequestBodies().get("ASinglePet").getContent();
+        Content actualPathContent = openAPI.getPaths().get("/adopt").getPost().getRequestBody().getContent();
+        Map properties = actualComponentContent.get("application/petstore+json").getSchema().getProperties();
+        assertNotNull(properties);
+        assertEquals(properties.size(), 2);
+        assertNotNull(actualPathContent);
+        assertEquals(actualPathContent, actualComponentContent);
+    }
+
 
     private static int getDynamicPort() {
         return new Random().ints(10000, 20000).findFirst().getAsInt();

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

@@ -0,0 +1,64 @@
+openapi: '3.0.0'
+info:
+  title: Pet Store API
+  version: '3.0'
+
+paths:
+  /adopt:
+    post:
+      requestBody:
+        $ref: '#/components/requestBodies/ASinglePet'
+      responses:
+        201:
+          $ref: '#/components/responses/Adopted'
+
+components:
+  requestBodies:
+    ASinglePet:
+      description: Adoption Request
+      required: true
+      content:
+        application/petstore+json:
+          schema:
+            $ref: '#/components/schemas/AdoptionRequest'
+  responses:
+    Adopted:
+      description: Pet successfully adopted
+      content:
+        application/petstore+json:
+          schema:
+            $ref: '#/components/schemas/AdoptionResponse'
+
+  schemas:
+    Pets:
+      type: object
+      properties:
+        pets:
+          type: array
+          items:
+            $ref: '#/components/schemas/Pet'
+    Pet:
+      type: object
+      properties:
+        name:
+          type: string
+          example: Fluffy
+    AdoptionRequest:
+      description:  Request to adopt a new pet
+      type: object
+      required:
+      - name
+      - pets
+      properties:
+        name:
+          description: Name pet store
+          type: string
+        pets:
+          $ref: '#/components/schemas/Pets'
+    AdoptionResponse:
+      description: Adoption Response
+      type: object
+      properties:
+        string:
+          description: Uri for the adopted pet
+          type: string