method overloaded

Author: springdoc

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

@@ -18,6 +18,7 @@
 import org.springdoc.core.OperationBuilder;
 import org.springdoc.core.RequestBodyBuilder;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.method.HandlerMethod;
@@ -28,6 +29,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 
@@ -40,6 +42,7 @@ public abstract class AbstractOpenApiResource {
 	protected OperationBuilder operationParser;
 	protected RequestBodyBuilder requestBodyBuilder;
 	protected GeneralInfoBuilder generalInfoBuilder;
+	public static boolean methodOverloaded;
 
 	protected AbstractOpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -81,7 +84,41 @@ protected void calculatePath(OpenAPIBuilder openAPIBuilder, HandlerMethod handle
 		Components components = openAPIBuilder.getComponents();
 		Paths paths = openAPIBuilder.getPaths();
 
+		Map<HttpMethod, Operation> operationMap = null;
+		if (paths.containsKey(operationPath)) {
+			PathItem pathItem = paths.get(operationPath);
+			operationMap = pathItem.readOperationsMap();
+		}
+
 		for (RequestMethod requestMethod : requestMethods) {
+
+			Operation existingOperation = null;
+			if (!CollectionUtils.isEmpty(operationMap)) {
+				// Get existing operation definition
+				if (RequestMethod.GET.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.GET);
+				} else if (RequestMethod.POST.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.POST);
+				} else if (RequestMethod.PUT.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.PUT);
+				} else if (RequestMethod.DELETE.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.DELETE);
+				} else if (RequestMethod.PATCH.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.PATCH);
+				} else if (RequestMethod.TRACE.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.TRACE);
+				} else if (RequestMethod.HEAD.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.HEAD);
+				} else if (RequestMethod.OPTIONS.equals(requestMethod)) {
+					existingOperation = operationMap.get(HttpMethod.OPTIONS);
+				}
+			}
+
+			if (existingOperation != null) {
+				methodOverloaded = true;
+			}
+			else
+				methodOverloaded = false;
 			// skip hidden operations
 			if (operationParser.isHidden(handlerMethod.getMethod())) {
 				continue;
@@ -98,7 +135,7 @@ protected void calculatePath(OpenAPIBuilder openAPIBuilder, HandlerMethod handle
 
 			mediaAttributes.calculateConsumesProduces(handlerMethod.getMethod());
 
-			Operation operation = new Operation();
+			Operation operation = (existingOperation != null) ? existingOperation : new Operation();
 
 			// compute tags
 			operation = generalInfoBuilder.buildTags(handlerMethod, operation, openAPI);

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

@@ -13,6 +13,7 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springdoc.api.AbstractOpenApiResource;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -237,7 +238,7 @@ private void buildApiResponses(Components components, Method method, ApiResponse
 		if (StringUtils.isBlank(apiResponse.getDescription())) {
 			apiResponse.setDescription(DEFAULT_DESCRIPTION);
 		}
-		if (apiResponse.getContent() != null && isGeneric) {
+		if (apiResponse.getContent() != null && (isGeneric || AbstractOpenApiResource.methodOverloaded)) {
 			// Merge with existing schema
 			Content existingContent = apiResponse.getContent();
 			Schema<?> schemaN = calculateSchema(components, method.getGenericReturnType());

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

@@ -6,6 +6,7 @@
 import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springdoc.api.AbstractOpenApiResource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.method.HandlerMethod;
@@ -108,12 +109,22 @@ private RequestBody buildRequestBody(RequestBody requestBody, Components compone
 		if (requestBody == null)
 			requestBody = new RequestBody();
 
-		if (requestBody.getContent() == null) {
+		if (requestBody.getContent() == null
+				|| (requestBody.getContent() != null && AbstractOpenApiResource.methodOverloaded)) {
+
 			Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo.getParameter(),
 					parameterInfo.getpName(), null, requestBodyInfo);
-			Content content = new Content();
-			for (String value : allConsumes) {
-				setMediaTypeToContent(schema, content, value);
+			Content content = requestBody.getContent();
+
+			if (AbstractOpenApiResource.methodOverloaded && content != null) {
+				for (String value : allConsumes) {
+					setMediaTypeToContent(schema, content, value);
+				}
+			} else {
+				content = new Content();
+				for (String value : allConsumes) {
+					setMediaTypeToContent(schema, content, value);
+				}
 			}
 			requestBody.setContent(content);
 		}
@@ -124,6 +135,7 @@ private RequestBody buildRequestBody(RequestBody requestBody, Components compone
 				requestBody.setDescription(parameterDoc.description());
 			requestBody.setRequired(parameterDoc.required());
 		}
+
 		return requestBody;
 	}