improved response content grouping

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/model/Endpoint.groovy

@@ -94,8 +94,8 @@ class Endpoint {
      * @return list of method responses
      */
     List<EndpointResponse> getEndpointResponses () {
-        List<Response> oks = successResponses
-        List<Response> errors = errorResponses
+        Set<Response> oks = successResponses
+        Set<Response> errors = errorResponses
         oks.collect {
             new EndpointResponse(main: it, errors: errors)
         }
@@ -104,29 +104,29 @@ class Endpoint {
     /**
      * finds the success responses
      */
-    private List<Response> getSuccessResponses () {
-        def success = responses.keySet ()
-            .findAll {
-                it.startsWith ('2')
-            }
+    private Set<Response> getSuccessResponses () {
+        Map<String, Response> result = [:]
 
-        if (success.size () == 1) {
-            return responses."${success.first ()}"
+        responses.findAll {
+            it.key.startsWith ('2')
+        }.each {
+            it.value.each {
+                result.put (it.contentType, it)
+            }
         }
 
-        println "Endpoint: can't find successful responses (${path}/${success})"
-        []
+        result.values () as Set<Response>
     }
 
     /**
      * finds the error responses
      */
-    private List<Response> getErrorResponses () {
+    private Set<Response> getErrorResponses () {
         responses.findAll {
             !it.key.startsWith ('2')
         }.collect {
             it.value.first ()
-        }
+        } as Set<Response>
     }
 
 }

src/testInt/groovy/com/github/hauner/openapi/processor/ProcessorEndToEndTest.groovy

@@ -45,7 +45,9 @@ class ProcessorEndToEndTest extends ProcessorTestBase {
         'response-array-data-type-mapping',
         'response-complex-data-types',
         'response-content-multiple',
-        'response-simple-data-types'
+        'response-content-single',
+        'response-simple-data-types',
+        'schema-composed'
     ]
 
     @Parameterized.Parameters(name = "{0}")

src/testInt/groovy/com/github/hauner/openapi/processor/ProcessorPendingTest.groovy

@@ -28,8 +28,8 @@ class ProcessorPendingTest extends ProcessorTestBase {
     @Parameterized.Parameters(name = "{0}")
     static Collection<TestSet> sources () {
         return [
-              new TestSet(name: 'schema-composed', parser: ParserType.SWAGGER),
-              new TestSet(name: 'schema-composed', parser: ParserType.OPENAPI4J)
+              new TestSet(name: 'response-content-single', parser: ParserType.SWAGGER),
+              new TestSet(name: 'response-content-single', parser: ParserType.OPENAPI4J)
         ]
     }
 

src/testInt/resources/response-content-single/generated/api/Api.java

@@ -0,0 +1,31 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-spring.
+ * DO NOT EDIT.
+ */
+
+package generated.api;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+
+public interface Api {
+
+    @GetMapping(path = "/foo")
+    ResponseEntity<Void> getFoo();
+
+    @GetMapping(
+            path = "/bar",
+            produces = {"text/plain"})
+    ResponseEntity<String> getBar();
+
+    @GetMapping(
+            path = "/bar-multi",
+            produces = {"text/plain"})
+    ResponseEntity<String> getBarMultiTextPlain();
+
+    @GetMapping(
+            path = "/bar-multi",
+            produces = {"application/json"})
+    ResponseEntity<String> getBarMultiApplicationJson();
+
+}

src/testInt/resources/response-content-single/openapi.yaml

@@ -0,0 +1,50 @@
+openapi: 3.0.2
+info:
+  title: test multiple 2xx responses with same content
+  version: 1.0.0
+
+paths:
+  /foo:
+    get:
+      summary: same content (no content)
+      responses:
+        '202':
+          description: accepted
+        '201':
+          description: created
+
+  /bar:
+    get:
+      summary: same content
+      responses:
+        '202':
+          description: accepted
+          content:
+            text/plain:
+                schema:
+                  type: string
+
+        '201':
+          description: created
+          content:
+            text/plain:
+                schema:
+                  type: string
+
+  /bar-multi:
+    get:
+      summary: same content
+      responses:
+        '202':
+          description: accepted
+          content:
+            text/plain:
+                schema:
+                  type: string
+
+        '201':
+          description: created
+          content:
+            application/json:
+                schema:
+                  type: string