Merge branch 'master' into ci-setup-java-v2

Author: gracekarina

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

@@ -391,6 +391,7 @@ public String processRefToExternalResponse(String $ref, RefFormat refFormat) {
             }
         }
         newRef = possiblyConflictingDefinitionName;
+        openAPI.getComponents().addResponses(newRef, response);
         cache.putRenamedRef($ref, newRef);
 
         if(response != null) {
@@ -408,6 +409,7 @@ public String processRefToExternalResponse(String $ref, RefFormat refFormat) {
         return newRef;
     }
 
+
     public String processRefToExternalRequestBody(String $ref, RefFormat refFormat) {
         String renamedRef = cache.getRenamedRef($ref);
         if(renamedRef != null) {

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

@@ -51,6 +51,7 @@ public void processOperation(Operation operation) {
             for (String responseCode : responses.keySet()) {
                 ApiResponse response = responses.get(responseCode);
                 if(response != null) {
+                    //This part allows parser to put response schema inline without the resolveFully option set to true
                     if (response.get$ref() != null) {
 
                         responseProcessor.processResponse(response);
@@ -63,9 +64,7 @@ public void processOperation(Operation operation) {
                             responses.put(responseCode, resolvedResponse);
                         }
                     }
-
                     responseProcessor.processResponse(response);
-
                 }
             }
         }

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

@@ -81,7 +81,11 @@ public void processReferenceResponse(ApiResponse response){
         RefFormat refFormat = computeRefFormat(response.get$ref());
         String $ref = response.get$ref();
         if (isAnExternalRefFormat(refFormat)){
-            externalRefProcessor.processRefToExternalResponse($ref, refFormat);
+            final String newRef =  externalRefProcessor.processRefToExternalResponse($ref, refFormat);
+
+            if (newRef != null) {
+                response.set$ref(newRef);
+            }
         }
     }
 }

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

@@ -83,6 +83,15 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1561() {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        SwaggerParseResult result = new OpenAPIV3Parser().readLocation("issue-1561/swagger.yaml", null, options);
+        OpenAPI openAPI = result.getOpenAPI();
+        assertTrue(openAPI.getComponents().getResponses().size() == 3);
+    }
+
     @Test
     public void testAnonymousModelAllOf() {
         ParseOptions options = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/issue-1561/exceptions.yml

@@ -0,0 +1,67 @@
+components:
+  schemas:
+    Exception:
+      type: object
+    Rfc7807Exception:
+      description: The Rfc7807 specification for exceptions.
+      allOf:
+        - $ref: '#/components/schemas/Exception'
+        - type: object
+          properties:
+            type:
+              type: string
+              description: A URI reference that identifies the problem type.
+          required:
+            - type
+            - title
+            - status
+            - detail
+    AbsisExceptionType:
+      type: string
+      enum: [VALIDATION, BUSINESS, RUNTIME, CHALLENGE, NOTFOUND, UNAUTHORIZED, AUTHENTICATION]
+      description: The possible types of an AbsisException.
+    AbsisFieldError:
+      type: object
+      description: The representation of a validation error.
+      properties:
+        code:
+          type: string
+          description: The error code.
+      example:
+        code: request
+        parameters:
+          - codes:
+              - aCode
+              - otherCode
+        value: NotNull
+    AbsisException:
+      description: Representation of an exception.
+      allOf:
+        - $ref: '#/components/schemas/Rfc7807Exception'
+        - type: object
+          properties:
+            _class:
+              type: string
+              description: The canonical name of the class AbsisException.
+            cause:
+              $ref: '#/components/schemas/AbsisException'
+              description: The AbsisException wrapping the exception that originated this exception.
+  responses:
+    '400':
+      description: Error when validating input parameters or request body.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/AbsisException'
+    '404':
+      description: The endpoint does not exists or the attempted resource does not exist.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/AbsisException'
+    '500':
+      description: Unexpected error occurred at one of the layers of the microservice, controller, business service, repository etc.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/AbsisException'

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

@@ -0,0 +1,67 @@
+openapi: 3.0.0
+info:
+  description: The Trazabilidad API offers the functionalities of the new trace regardless of the channel in which it is in invoked.
+  version: 1.0.2
+  title: ApiTrazabilidad
+
+tags:
+  - name: Trazabilidad
+    description: Trazabilidad API
+paths:
+  '/operationalServices/tracks/scopes/{scopeId}/processes/{processId}/petitions':
+    post:
+      tags:
+        - createPetition
+      summary: Creates a new instance in the traceability operation.
+      operationId: createPetition
+      description: Creates a new instance in the traceability operation.
+      parameters:
+        - in: path
+          name: processId
+          description: instance process ID
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        $ref: '#/components/requestBodies/TrazabilidadBodyRequest'
+      responses:
+        '201':
+          description: Created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/BodyOutResponse'
+        '400':
+          $ref: >-
+            exceptions.yml#/components/responses/400
+        '404':
+          $ref: >-
+            exceptions.yml#/components/responses/404
+        '500':
+          $ref: >-
+            exceptions.yml#/components/responses/500
+
+components:
+  requestBodies:
+    TrazabilidadBodyRequest:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/TrazabilidadBodyRequest'
+      description: body request
+      required: true
+  schemas:
+    BodyOutResponse:
+      type: object
+      properties:
+        petitionId:
+          type: string
+          description: The ID of the request that has been created
+          example: "971205125921"
+    TrazabilidadBodyRequest:
+      type: object
+      properties:
+        action:
+          type: string
+          description: Action to be performed. values -- alta , mod , fin , baja
+          example: "alta"

pom.xml

@@ -371,7 +371,7 @@
         <slf4j-version>1.7.30</slf4j-version>
         <swagger-core-version>2.1.10</swagger-core-version>
         <swagger-core-v2-version>1.6.2</swagger-core-v2-version>
-        <junit-version>4.13.1</junit-version>
+        <junit-version>4.13.2</junit-version>
         <testng-version>6.14.2</testng-version>
         <jmockit-version>1.35</jmockit-version>
         <wiremock-version>2.15.0</wiremock-version>