fixes #646

Author: bnasslahsen

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

@@ -170,7 +170,10 @@ public static void buildContentFromDoc(Components components, ApiResponses apiRe
 			if (optionalContent.isPresent()) {
 				Content newContent = optionalContent.get();
 				if (methodAttributes.isMethodOverloaded() && existingContent != null) {
-					Arrays.stream(methodAttributes.getMethodProduces()).filter(mediaTypeStr -> (newContent.get(mediaTypeStr) != null)).forEach(mediaTypeStr -> mergeSchema(existingContent, newContent.get(mediaTypeStr).getSchema(), mediaTypeStr));
+					Arrays.stream(methodAttributes.getMethodProduces()).filter(mediaTypeStr -> (newContent.get(mediaTypeStr) != null)).forEach(mediaTypeStr -> {
+						if (newContent.get(mediaTypeStr).getSchema() != null)
+							mergeSchema(existingContent, newContent.get(mediaTypeStr).getSchema(), mediaTypeStr);
+					});
 					apiResponse.content(existingContent);
 				}
 				else

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

@@ -100,7 +100,10 @@ private void buildResquestBodyContent(io.swagger.v3.oas.annotations.parameters.R
 			if (optionalContent.isPresent() && existingContent != null) {
 				Content newContent = optionalContent.get();
 				if (methodAttributes.isMethodOverloaded()) {
-					Arrays.stream(methodAttributes.getMethodProduces()).filter(mediaTypeStr -> (newContent.get(mediaTypeStr) != null)).forEach(mediaTypeStr -> mergeSchema(existingContent, newContent.get(mediaTypeStr).getSchema(), mediaTypeStr));
+					Arrays.stream(methodAttributes.getMethodProduces()).filter(mediaTypeStr -> (newContent.get(mediaTypeStr) != null)).forEach(mediaTypeStr -> {
+						if (newContent.get(mediaTypeStr).getSchema() != null)
+							mergeSchema(existingContent, newContent.get(mediaTypeStr).getSchema(), mediaTypeStr);
+					});
 					requestBodyObject.content(existingContent);
 				}
 				else
@@ -116,7 +119,7 @@ public Optional<RequestBody> buildRequestBodyFromDoc(io.swagger.v3.oas.annotatio
 	}
 
 	public Optional<RequestBody> buildRequestBodyFromDoc(io.swagger.v3.oas.annotations.parameters.RequestBody requestBody,
-			MethodAttributes methodAttributes, Components components,JsonView jsonViewAnnotation) {
+			MethodAttributes methodAttributes, Components components, JsonView jsonViewAnnotation) {
 		return this.buildRequestBodyFromDoc(requestBody, null, methodAttributes,
 				components, jsonViewAnnotation);
 	}