Skip to content

Commit 70adc0d

Browse files
committed
upgrade swagger-core to 2.1.13
1 parent 8c4fb69 commit 70adc0d

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6262
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6363
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
64-
<swagger-api.version>2.1.12</swagger-api.version>
64+
<swagger-api.version>2.1.13</swagger-api.version>
6565
<swagger-ui.version>4.5.0</swagger-ui.version>
6666
<classgraph.version>4.8.138</classgraph.version>
6767
<webjars-locator-core.version>0.48</webjars-locator-core.version>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/RequestBodyService.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.swagger.v3.core.util.AnnotationsUtils;
3131
import io.swagger.v3.oas.models.Components;
3232
import io.swagger.v3.oas.models.media.Content;
33+
import io.swagger.v3.oas.models.media.MediaType;
3334
import io.swagger.v3.oas.models.media.Schema;
3435
import io.swagger.v3.oas.models.parameters.RequestBody;
3536
import org.apache.commons.lang3.StringUtils;
@@ -131,7 +132,7 @@ public Optional<RequestBody> buildRequestBodyFromDoc(
131132
*/
132133
private void buildResquestBodyContent(io.swagger.v3.oas.annotations.parameters.RequestBody requestBody, RequestBody requestBodyOp, MethodAttributes methodAttributes, Components components, JsonView jsonViewAnnotation, String[] classConsumes, String[] methodConsumes, RequestBody requestBodyObject) {
133134
Optional<Content> optionalContent = SpringDocAnnotationsUtils
134-
.getContent(requestBody.content(),getConsumes(classConsumes),
135+
.getContent(requestBody.content(), getConsumes(classConsumes),
135136
getConsumes(methodConsumes), null, components, jsonViewAnnotation);
136137
if (requestBodyOp == null) {
137138
if (optionalContent.isPresent()) {
@@ -243,7 +244,7 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met
243244

244245
RequestPart requestPart = methodParameter.getParameterAnnotation(RequestPart.class);
245246
String paramName = null;
246-
if (requestPart != null){
247+
if (requestPart != null) {
247248
paramName = StringUtils.defaultIfEmpty(requestPart.value(), requestPart.name());
248249
parameterInfo.setRequired(requestPart.required());
249250
parameterInfo.setRequestPart(true);
@@ -323,10 +324,14 @@ private void buildContent(RequestBody requestBody, MethodAttributes methodAttrib
323324
for (String value : methodAttributes.getMethodConsumes()) {
324325
io.swagger.v3.oas.models.media.MediaType mediaTypeObject = new io.swagger.v3.oas.models.media.MediaType();
325326
mediaTypeObject.setSchema(schema);
326-
if (content.get(value) != null) {
327-
mediaTypeObject.setExample(content.get(value).getExample());
328-
mediaTypeObject.setExamples(content.get(value).getExamples());
329-
mediaTypeObject.setEncoding(content.get(value).getEncoding());
327+
MediaType mediaType = content.get(value);
328+
if (mediaType != null) {
329+
if (mediaType.getExample() != null)
330+
mediaTypeObject.setExample(mediaType.getExample());
331+
if (mediaType.getExamples() != null)
332+
mediaTypeObject.setExamples(mediaType.getExamples());
333+
if (mediaType.getEncoding() != null)
334+
mediaTypeObject.setEncoding(mediaType.getEncoding());
330335
}
331336
content.addMediaType(value, mediaTypeObject);
332337
}

0 commit comments

Comments
 (0)