Merge pull request #1218 from swagger-api/codegen-issue-9773

fixing remote schema ref resolving in referenced request body

Author: gracekarina

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

@@ -322,6 +322,8 @@ public String processRefToExternalRequestBody(String $ref, RefFormat refFormat)
                 } else {
                     processRefToExternalRequestBody(file + body.get$ref(), RefFormat.RELATIVE);
                 }
+            }else if(body.getContent() != null){
+                processRefContent(body.getContent(), $ref);
             }
         }
 

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

@@ -66,6 +66,18 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testCodegenIssue9773() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setFlatten(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation("codegen-issue-9773/openapi.yaml", null, options);
+
+        OpenAPI openAPI = parseResult.getOpenAPI();
+        assertNotNull(openAPI.getComponents().getSchemas().get("Foo"));
+    }
+
     @Test
     public void testIssueResolveCallBacks() {
         ParseOptions options = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/codegen-issue-9773/domain.yaml

@@ -0,0 +1,16 @@
+components:
+  requestBodies:
+    RequestBody1:
+      required: true
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Foo'
+
+  schemas:
+    Foo:
+      type: object
+      properties:
+        foo:
+          type: string
+          example: bar

modules/swagger-parser-v3/src/test/resources/codegen-issue-9773/openapi.yaml

@@ -0,0 +1,12 @@
+openapi: 3.0.2
+info:
+  title: 'Codegen test: requestBody with an external $ref'
+  version: 0.0.0
+paths:
+  /foo:
+    post:
+      requestBody:
+        $ref: './domain.yaml#/components/requestBodies/RequestBody1'
+      responses:
+        '200':
+          description: OK

modules/swagger-parser-v3/src/test/resources/issue-1081/spec2.yaml

@@ -0,0 +1,15 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: spec2
+components:
+  schemas:
+    FlowDescription:
+      type: string
+    EthFlowDescription:
+      type: object
+      properties:
+        fDesc:
+          $ref: '#/components/schemas/FlowDescription'
+        fDir:
+          $ref: 'spec1.yaml#/components/schemas/FlowDirection'

modules/swagger-parser-v3/src/test/resources/remote_references/remote_requestBody.yaml

@@ -5,4 +5,34 @@ requestBodies:
       application/json:
         description: Pet object that needs to be added to the store
         schema:
-          "$ref": "#/components/schemas/Pet"
+          Pet:
+            type: object
+            required:
+              - name
+              - photoUrls
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+                example: doggie
+              photoUrls:
+                type: array
+                xml:
+                  name: photoUrl
+                  wrapped: true
+                items:
+                  type: string
+              tags:
+                type: array
+                xml:
+                  name: tag
+                  wrapped: true
+              status:
+                type: string
+                description: pet status in the store
+                enum:
+                  - available
+                  - pending
+                  - sold