Skip to content

Commit 5f29c79

Browse files
committed
upgrade to swagger-core 2.1.13
1 parent 2015aaf commit 5f29c79

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
@@ -68,7 +68,7 @@
6868
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6969
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
7070
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
71-
<swagger-api.version>2.1.12</swagger-api.version>
71+
<swagger-api.version>2.1.13</swagger-api.version>
7272
<swagger-ui.version>4.5.0</swagger-ui.version>
7373
<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
7474
<classgraph.version>4.8.138</classgraph.version>

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.swagger.v3.core.util.AnnotationsUtils;
2929
import io.swagger.v3.oas.models.Components;
3030
import io.swagger.v3.oas.models.media.Content;
31+
import io.swagger.v3.oas.models.media.MediaType;
3132
import io.swagger.v3.oas.models.media.Schema;
3233
import io.swagger.v3.oas.models.parameters.RequestBody;
3334
import org.apache.commons.lang3.StringUtils;
@@ -125,7 +126,7 @@ public Optional<RequestBody> buildRequestBodyFromDoc(
125126
*/
126127
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) {
127128
Optional<Content> optionalContent = SpringDocAnnotationsUtils
128-
.getContent(requestBody.content(),getConsumes(classConsumes),
129+
.getContent(requestBody.content(), getConsumes(classConsumes),
129130
getConsumes(methodConsumes), null, components, jsonViewAnnotation);
130131
if (requestBodyOp == null) {
131132
if (optionalContent.isPresent()) {
@@ -237,7 +238,7 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met
237238

238239
RequestPart requestPart = methodParameter.getParameterAnnotation(RequestPart.class);
239240
String paramName = null;
240-
if (requestPart != null){
241+
if (requestPart != null) {
241242
paramName = StringUtils.defaultIfEmpty(requestPart.value(), requestPart.name());
242243
parameterInfo.setRequired(requestPart.required());
243244
parameterInfo.setRequestPart(true);
@@ -317,10 +318,14 @@ private void buildContent(RequestBody requestBody, MethodAttributes methodAttrib
317318
for (String value : methodAttributes.getMethodConsumes()) {
318319
io.swagger.v3.oas.models.media.MediaType mediaTypeObject = new io.swagger.v3.oas.models.media.MediaType();
319320
mediaTypeObject.setSchema(schema);
320-
if (content.get(value) != null) {
321-
mediaTypeObject.setExample(content.get(value).getExample());
322-
mediaTypeObject.setExamples(content.get(value).getExamples());
323-
mediaTypeObject.setEncoding(content.get(value).getEncoding());
321+
MediaType mediaType = content.get(value);
322+
if (mediaType != null) {
323+
if (mediaType.getExample() != null)
324+
mediaTypeObject.setExample(mediaType.getExample());
325+
if (mediaType.getExamples() != null)
326+
mediaTypeObject.setExamples(mediaType.getExamples());
327+
if (mediaType.getEncoding() != null)
328+
mediaTypeObject.setEncoding(mediaType.getEncoding());
324329
}
325330
content.addMediaType(value, mediaTypeObject);
326331
}

0 commit comments

Comments
 (0)