NPE for request bodies with content that has media type MULTIPART_FORM_DATA_VALUE. Fixes #1804

Author: bnasslahsen

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

@@ -198,7 +198,6 @@ protected AbstractRequestService(GenericParameterService parameterBuilder, Reque
 		this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer;
 		this.defaultFlatParamObject = parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties().isDefaultFlatParamObject();
 		this.defaultSupportFormData = parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties().isDefaultSupportFormData();
-
 	}
 
 	/**
@@ -330,19 +329,18 @@ else if (!RequestMethod.GET.equals(requestMethod)) {
 		if (defaultSupportFormData && requestBody != null
 				&& requestBody.getContent() != null
 				&& requestBody.getContent().containsKey(org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE)) {
-			io.swagger.v3.oas.models.media.Schema<?> mergedSchema = requestBodyInfo.getMergedSchema();
 			Iterator<Entry<String, Parameter>> it = map.entrySet().iterator();
 			while (it.hasNext()) {
 				Entry<String, Parameter> entry = it.next();
 				Parameter parameter = entry.getValue();
 				if (!ParameterIn.PATH.toString().equals(parameter.getIn())) {
-					io.swagger.v3.oas.models.media.Schema<?> itemSchema = new io.swagger.v3.oas.models.media.Schema() ;
+					io.swagger.v3.oas.models.media.Schema<?> itemSchema = new io.swagger.v3.oas.models.media.Schema<>() ;
 					itemSchema.setName(entry.getKey());
 					itemSchema.setDescription(parameter.getDescription());
 					itemSchema.setDeprecated(parameter.getDeprecated());
 					if (parameter.getExample() != null)
 						itemSchema.setExample(parameter.getExample());
-					mergedSchema.addProperty(entry.getKey(), itemSchema);
+					requestBodyInfo.addProperties(entry.getKey(), itemSchema);
 					it.remove();
 				}
 			}