Custom Requestmapping consumes responses. Fixes #1546

Author: bnasslahsen

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

@@ -609,8 +609,8 @@ protected void calculatePath(RouterOperation routerOperation, Locale locale) {
 	 * @param locale the locale
 	 */
 	protected void calculatePath(HandlerMethod handlerMethod, String operationPath,
-			Set<RequestMethod> requestMethods, Locale locale) {
-		this.calculatePath(handlerMethod, new RouterOperation(operationPath, requestMethods.toArray(new RequestMethod[requestMethods.size()])), locale);
+			Set<RequestMethod> requestMethods,String[] consumes, String[] produces, String[] headers, Locale locale) {
+		this.calculatePath(handlerMethod, new RouterOperation(operationPath, requestMethods.toArray(new RequestMethod[requestMethods.size()]), consumes, produces, headers), locale);
 	}
 
 	/**

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

@@ -31,6 +31,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -269,21 +270,26 @@ else if (reqMappingClass != null) {
 	 * @param headers the headers
 	 */
 	private void fillMethods(String[] produces, String[] consumes, String[] headers) {
-		if (ArrayUtils.isNotEmpty(produces))
-			methodProduces = produces;
-		else if (ArrayUtils.isNotEmpty(classProduces))
-			methodProduces = classProduces;
-		else
-			methodProduces = new String[] { defaultProducesMediaType };
+		if (ArrayUtils.isEmpty(methodProduces)) {
+			if (ArrayUtils.isNotEmpty(produces))
+				methodProduces = produces;
+			else if (ArrayUtils.isNotEmpty(classProduces))
+				methodProduces = classProduces;
+			else
+				methodProduces = new String[] { defaultProducesMediaType };
+		}
 
-		if (ArrayUtils.isNotEmpty(consumes))
-			methodConsumes = consumes;
-		else if (ArrayUtils.isNotEmpty(classConsumes))
-			methodConsumes = classConsumes;
-		else
-			methodConsumes = new String[] { defaultConsumesMediaType };
+		if (ArrayUtils.isEmpty(methodConsumes)) {
+			if (ArrayUtils.isNotEmpty(consumes))
+				methodConsumes = consumes;
+			else if (ArrayUtils.isNotEmpty(classConsumes))
+				methodConsumes = classConsumes;
+			else
+				methodConsumes = new String[] { defaultConsumesMediaType };
+		}
 
-		setHeaders(headers);
+		if (CollectionUtils.isEmpty(this.headers))
+			setHeaders(headers);
 	}
 
 	/**

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/RouterOperation.java

@@ -141,9 +141,12 @@ public RouterOperation(org.springdoc.core.annotations.RouterOperation routerOper
 	 * @param path the path
 	 * @param methods the methods
 	 */
-	public RouterOperation(String path, RequestMethod[] methods) {
+	public RouterOperation(String path, RequestMethod[] methods,String[] consumes, String[] produces, String[] headers) {
 		this.path = path;
 		this.methods = methods;
+		this.consumes=consumes;
+		this.produces=produces;
+		this.headers=headers;
 	}
 
 	/**

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestRouterOperationService.java

@@ -280,7 +280,7 @@ else if (ControllerType.PROPERTY.equals(controllerType))
 			MethodResourceMapping methodResourceMapping, HandlerMethod handlerMethod,
 			RequestMethod requestMethod, ResourceMetadata resourceMetadata, String
 			operationPath, ControllerType controllerType) {
-		RouterOperation routerOperation = new RouterOperation(operationPath, new RequestMethod[] { requestMethod });
+		RouterOperation routerOperation = new RouterOperation(operationPath, new RequestMethod[] { requestMethod }, null, null, null);
 		MethodAttributes methodAttributes = new MethodAttributes(springDocConfigProperties.getDefaultConsumesMediaType(), springDocConfigProperties.getDefaultProducesMediaType(), dataRestRepository.getLocale());
 		methodAttributes.calculateConsumesProduces(handlerMethod.getMethod());
 		routerOperation.setConsumes(methodAttributes.getMethodConsumes());

springdoc-openapi-data-rest/src/test/resources/results/app22.json

@@ -324,6 +324,16 @@
                 "schema": {
                   "$ref": "#/components/schemas/Person"
                 }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Person"
+                }
+              },
+              "application/prs.hal-forms+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Person"
+                }
               }
             }
           }

springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java

@@ -197,7 +197,7 @@ && isFilterCondition(handlerMethod, operationPath, produces, consumes, headers))
 						// default allowed requestmethods
 						if (requestMethods.isEmpty())
 							requestMethods = this.getDefaultAllowedHttpMethods();
-						calculatePath(handlerMethod, operationPath, requestMethods, locale);
+						calculatePath(handlerMethod, operationPath, requestMethods, consumes, produces, headers, locale);
 					}
 				}
 			}