Skip to content

Commit 993ec4b

Browse files
Mattias-SehlstedtMattias-Sehlstedt
committed
Upgrade swagger-core from version 2.2.47 to 2.2.48
1 parent da4cb67 commit 993ec4b

17 files changed

Lines changed: 18 additions & 20 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<central-publishing-maven-plugin.version>0.7.0
5555
</central-publishing-maven-plugin.version>
5656
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
57-
<swagger-api.version>2.2.47</swagger-api.version>
57+
<swagger-api.version>2.2.48</swagger-api.version>
5858
<swagger-ui.version>5.32.2</swagger-ui.version>
5959
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6060
<jjwt.version>0.9.1</jjwt.version>

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Boolean hasRequiredMarker(AnnotatedMember annotatedMember) {
5757
if (schemaAnnotation.required() || requiredMode == Schema.RequiredMode.REQUIRED) {
5858
return true;
5959
}
60-
else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || (StringUtils.isNotEmpty(schemaAnnotation.defaultValue()) && !Schema.DEFAULT_SENTINEL.equals(schemaAnnotation.defaultValue()))) {
60+
else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || StringUtils.isNotEmpty(schemaAnnotation.defaultValue())) {
6161
return false;
6262
}
6363
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,7 @@ public String[] allowableValues() {
366366

367367
@Override
368368
public String defaultValue() {
369-
String defaultValue = getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
370-
return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
369+
return getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
371370
}
372371

373372
@Override
@@ -758,8 +757,7 @@ public String[] allowableValues() {
758757

759758
@Override
760759
public String defaultValue() {
761-
String defaultValue = getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
762-
return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
760+
return getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
763761
}
764762

765763
@Override

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public class Builder {
197197
/**
198198
* Provides a default value.
199199
*/
200-
private String defaultValue = Schema.DEFAULT_SENTINEL;
200+
private String defaultValue = "";
201201

202202
/**
203203
* Provides a discriminator property value.

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public static Object castDefaultValue(Schema schema, Object defaultValue) {
504504
*/
505505
public static Object resolveDefaultValue(String defaultValueStr, ObjectMapper objectMapper) {
506506
Object defaultValue = null;
507-
if (StringUtils.isNotEmpty(defaultValueStr) && !io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL.equals(defaultValueStr)) {
507+
if (StringUtils.isNotEmpty(defaultValueStr)) {
508508
try {
509509
defaultValue = objectMapper.readTree(defaultValueStr);
510510
}

‎springdoc-openapi-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>springdoc-openapi</artifactId>
44
<groupId>org.springdoc</groupId>
5-
<version>2.8.17-SNAPSHOT</version>
5+
<version>2.8.18-SNAPSHOT</version>
66
</parent>
77
<packaging>pom</packaging>
88
<modelVersion>4.0.0</modelVersion>

‎springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>springdoc-openapi-tests</artifactId>
44
<groupId>org.springdoc</groupId>
5-
<version>2.8.17-SNAPSHOT</version>
5+
<version>2.8.18-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

‎springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>springdoc-openapi-tests</artifactId>
44
<groupId>org.springdoc</groupId>
5-
<version>2.8.17-SNAPSHOT</version>
5+
<version>2.8.18-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

‎springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>springdoc-openapi-tests</artifactId>
44
<groupId>org.springdoc</groupId>
5-
<version>2.8.17-SNAPSHOT</version>
5+
<version>2.8.18-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>springdoc-openapi-data-rest-tests</artifactId>

‎springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>springdoc-openapi-tests</artifactId>
44
<groupId>org.springdoc</groupId>
5-
<version>2.8.17-SNAPSHOT</version>
5+
<version>2.8.18-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

0 commit comments

Comments
 (0)