Skip to content

Upgrade swagger-core from version 2.2.47 to 2.2.48 #3266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mattias-Sehlstedt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade swagger-core from version 2.2.47 to 2.2.48 #3266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<central-publishing-maven-plugin.version>0.7.0
</central-publishing-maven-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<swagger-api.version>2.2.47</swagger-api.version>
<swagger-api.version>2.2.48</swagger-api.version>
<swagger-ui.version>5.32.2</swagger-ui.version>
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
<jjwt.version>0.9.1</jjwt.version>
Expand Down
2 changes: 1 addition & 1 deletion ...tarter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public Boolean hasRequiredMarker(AnnotatedMember annotatedMember) {
if (schemaAnnotation.required() || requiredMode == Schema.RequiredMode.REQUIRED) {
return true;
}
else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || (StringUtils.isNotEmpty(schemaAnnotation.defaultValue()) && !Schema.DEFAULT_SENTINEL.equals(schemaAnnotation.defaultValue()))) {
else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || StringUtils.isNotEmpty(schemaAnnotation.defaultValue())) {
return false;
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,7 @@ public String[] allowableValues() {

@Override
public String defaultValue() {
String defaultValue = getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
return getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
}

@Override
Expand Down Expand Up @@ -758,8 +757,7 @@ public String[] allowableValues() {

@Override
public String defaultValue() {
String defaultValue = getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
return getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...c-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public class Builder {
/**
* Provides a default value.
*/
private String defaultValue = Schema.DEFAULT_SENTINEL;
private String defaultValue = "";

/**
* Provides a discriminator property value.
Expand Down
2 changes: 1 addition & 1 deletion ...napi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ public static Object castDefaultValue(Schema schema, Object defaultValue) {
*/
public static Object resolveDefaultValue(String defaultValueStr, ObjectMapper objectMapper) {
Object defaultValue = null;
if (StringUtils.isNotEmpty(defaultValueStr) && !io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL.equals(defaultValueStr)) {
if (StringUtils.isNotEmpty(defaultValueStr)) {
try {
defaultValue = objectMapper.readTree(defaultValueStr);
}
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>springdoc-openapi-data-rest-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-groovy-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-tests</artifactId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<artifactId>springdoc-openapi-groovy-tests</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-hateoas-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>springdoc-openapi-hateoas-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-javadoc-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-tests</artifactId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>springdoc-openapi-kotlin-webflux-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>springdoc-openapi-tests</artifactId>
<groupId>org.springdoc</groupId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>springdoc-openapi-kotlin-webmvc-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-tests</artifactId>
<version>2.8.17-SNAPSHOT</version>
<version>2.8.18-SNAPSHOT</version>
</parent>
<artifactId>springdoc-openapi-security-tests</artifactId>
<name>${project.artifactId}</name>
Expand Down
Loading