Springdocs doesn't detect header declarations in class level @RequestMappings. Fixes #1073.

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -359,6 +359,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
 				methodAttributes.setClassProduces(reqMappingClass.produces());
 			}
 
+			methodAttributes.calculateHeadersForClass(method.getDeclaringClass());
 			methodAttributes.calculateConsumesProduces(method);
 
 			Operation operation = (existingOperation != null) ? existingOperation : new Operation();

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

@@ -320,7 +320,10 @@ private LinkedHashMap<String, Parameter> getParameterLinkedHashMap(Components co
 	@SuppressWarnings("unchecked")
 	public static Collection<Parameter> getHeaders(MethodAttributes methodAttributes, Map<String, Parameter> map) {
 		for (Map.Entry<String, String> entry : methodAttributes.getHeaders().entrySet()) {
-			Parameter parameter = new Parameter().in(ParameterIn.HEADER.toString()).name(entry.getKey()).schema(new StringSchema().addEnumItem(entry.getValue()));
+			StringSchema schema = new StringSchema();
+			if(StringUtils.isNotEmpty(entry.getValue()))
+				schema.addEnumItem(entry.getValue());
+			Parameter parameter = new Parameter().in(ParameterIn.HEADER.toString()).name(entry.getKey()).schema(schema);
 			if (map.containsKey(entry.getKey())) {
 				parameter = map.get(entry.getKey());
 				if (StringUtils.isNotEmpty(entry.getValue()))

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

@@ -408,4 +408,16 @@ public boolean isWithResponseBodySchemaDoc() {
 	public void setWithResponseBodySchemaDoc(boolean withResponseBodySchemaDoc) {
 		this.withResponseBodySchemaDoc = withResponseBodySchemaDoc;
 	}
+
+	/**
+	 * Calculate headers for class.
+	 *
+	 * @param declaringClass the declaring class
+	 */
+	public void calculateHeadersForClass(Class<?> declaringClass) {
+		RequestMapping reqMappingClass = AnnotatedElementUtils.findMergedAnnotation(declaringClass, RequestMapping.class);
+		if (reqMappingClass != null) {
+			fillMethods(reqMappingClass.produces(), reqMappingClass.consumes(), reqMappingClass.headers());
+		}
+	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app129/HelloController.java

@@ -28,7 +28,7 @@
 import org.springframework.web.context.request.async.DeferredResult;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping(path = "/api", headers = {"userId", "registrationId"})
 public class HelloController {
 
 	@GetMapping("/test")

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

@@ -25,6 +25,20 @@
             "schema": {
               "$ref": "#/components/schemas/ActualReturnedEntity"
             }
+          },
+          {
+            "name": "userId",
+            "in": "header",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "registrationId",
+            "in": "header",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {

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

@@ -22,10 +22,7 @@
             "name": "X-API-VERSION",
             "in": "header",
             "schema": {
-              "type": "string",
-              "enum": [
-                ""
-              ]
+              "type": "string"
             }
           }
         ],