fixes #212: Missing Response Content

Author: springdoc

springdoc-openapi-common/src/main/java/org/springdoc/core/MethodAttributes.java

@@ -52,29 +52,35 @@ public String[] getMethodConsumes() {
 
 
     public void calculateConsumesProduces(Method method) {
-        PostMapping reqPostMappringMethod =  AnnotatedElementUtils.findMergedAnnotation(method, PostMapping.class);
-        if (reqPostMappringMethod != null) {
-            fillMethods(reqPostMappringMethod.produces(), reqPostMappringMethod.consumes());
+        PostMapping reqPostMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, PostMapping.class);
+        if (reqPostMappingMethod != null) {
+            fillMethods(reqPostMappingMethod.produces(), reqPostMappingMethod.consumes());
             return;
         }
-        GetMapping reqGetMappringMethod =  AnnotatedElementUtils.findMergedAnnotation(method, GetMapping.class);
-        if (reqGetMappringMethod != null) {
-            fillMethods(reqGetMappringMethod.produces(), reqGetMappringMethod.consumes());
+        GetMapping reqGetMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, GetMapping.class);
+        if (reqGetMappingMethod != null) {
+            fillMethods(reqGetMappingMethod.produces(), reqGetMappingMethod.consumes());
             return;
         }
-        DeleteMapping reqDeleteMappringMethod =  AnnotatedElementUtils.findMergedAnnotation(method, DeleteMapping.class);
-        if (reqDeleteMappringMethod != null) {
-            fillMethods(reqDeleteMappringMethod.produces(), reqDeleteMappringMethod.consumes());
+        DeleteMapping reqDeleteMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, DeleteMapping.class);
+        if (reqDeleteMappingMethod != null) {
+            fillMethods(reqDeleteMappingMethod.produces(), reqDeleteMappingMethod.consumes());
             return;
         }
-        PutMapping reqPutMappringMethod = AnnotatedElementUtils.findMergedAnnotation(method, PutMapping.class);
-        if (reqPutMappringMethod != null) {
-            fillMethods(reqPutMappringMethod.produces(), reqPutMappringMethod.consumes());
+        PutMapping reqPutMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, PutMapping.class);
+        if (reqPutMappingMethod != null) {
+            fillMethods(reqPutMappingMethod.produces(), reqPutMappingMethod.consumes());
             return;
         }
-        RequestMapping reqMappringMethod = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
-        if (reqMappringMethod != null) {
-            fillMethods(reqMappringMethod.produces(), reqMappringMethod.consumes());
+        RequestMapping reqMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
+        RequestMapping reqMappingClass = AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), RequestMapping.class);
+
+        if (reqMappingMethod != null && reqMappingClass != null) {
+            fillMethods(ArrayUtils.addAll(reqMappingMethod.produces(), reqMappingClass.produces()), ArrayUtils.addAll(reqMappingMethod.consumes(), reqMappingClass.consumes()));
+        } else if (reqMappingMethod != null) {
+            fillMethods(reqMappingMethod.produces(), reqMappingMethod.consumes());
+        } else if (reqMappingClass != null) {
+            fillMethods(reqMappingClass.produces(), reqMappingClass.consumes());
         }
     }
 

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app62/BaseController.java

@@ -0,0 +1,23 @@
+package test.org.springdoc.api.app62;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RestController
+@RequestMapping
+public @interface BaseController {
+    @AliasFor(annotation = RequestMapping.class)
+    String[] value() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] produces() default {MediaType.APPLICATION_XML_VALUE, MediaType.APPLICATION_JSON_VALUE};
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app62/SpringDocApp62Test.java

@@ -0,0 +1,5 @@
+package test.org.springdoc.api.app62;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+public class SpringDocApp62Test extends AbstractSpringDocTest {}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app62/SpringDocTestApp.java

@@ -0,0 +1,11 @@
+package test.org.springdoc.api.app62;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringDocTestApp {
+    public static void main(String[] args) {
+        SpringApplication.run(SpringDocTestApp.class, args);
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app62/TestController.java

@@ -0,0 +1,18 @@
+package test.org.springdoc.api.app62;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@BaseController
+@Tag(name = "Test Controller")
+public class TestController {
+
+    @RequestMapping(value = "/test", method = RequestMethod.GET)
+    @Operation(summary = "This is the test endpoint")
+    public String test(@RequestHeader("Accept") String accept) {
+        return "This is a test";
+    }
+}

springdoc-openapi-webmvc-core/src/test/resources/results/app62.json

@@ -0,0 +1,52 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "Test Controller"
+        ],
+        "summary": "This is the test endpoint",
+        "operationId": "test",
+        "parameters": [
+          {
+            "name": "Accept",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "application/xml": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}