Skip to content

Bump swagger-api to 2.2.32 and fix tests (wip) #3002

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −23
Draft

Bump swagger-api to 2.2.32 and fix tests (wip) #3002

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 @@ -53,7 +53,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.30</swagger-api.version>
<swagger-api.version>2.2.32</swagger-api.version>
<swagger-ui.version>5.21.0</swagger-ui.version>
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
<jjwt.version>0.9.1</jjwt.version>
Expand Down
10 changes: 10 additions & 0 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 @@ -449,6 +449,11 @@ public Class<?> contains() {
return parameterSchema.$dynamicAnchor();
}

@Override
public String $dynamicRef() {
return parameterSchema.$dynamicRef();
}

@Override
public String contentEncoding() {
return parameterSchema.contentEncoding();
Expand Down Expand Up @@ -836,6 +841,11 @@ public Class<?> contains() {
return schema.$dynamicAnchor();
}

@Override
public String $dynamicRef() {
return schema.$dynamicRef();
}

@Override
public String contentEncoding() {
return schema.contentEncoding();
Expand Down
10 changes: 10 additions & 0 deletions ...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 @@ -299,6 +299,11 @@ public class Builder {
*/
private String $dynamicAnchor = "";

/**
* The Dynamic ref
*/
private String $dynamicRef = "";

/**
* The Content encoding.
*/
Expand Down Expand Up @@ -1149,6 +1154,11 @@ public Class<?> contains() {
return $dynamicAnchor;
}

@Override
public String $dynamicRef() {
return $dynamicRef;
}

@Override
public String contentEncoding() {
return contentEncoding;
Expand Down
39 changes: 20 additions & 19 deletions springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"in": "query",
"required": true,
"schema": {
"type": "string",
"maxLength": 10,
"minLength": 0,
"type": "string"
"minLength": 0
}
}
],
Expand Down Expand Up @@ -94,9 +94,9 @@
"in": "query",
"required": true,
"schema": {
"type": "string",
"maxLength": 10,
"minLength": 0,
"type": "string"
"minLength": 0
}
}
],
Expand Down Expand Up @@ -151,43 +151,44 @@
"components": {
"schemas": {
"Person": {
"required": [
"lastName"
],
"type": "object",
"properties": {
"id": {
"type": "integer",
"format": "int64"
},
"firstName": {
"type": "string",
"maxLength": 2147483647,
"minLength": 2,
"type": "string"
"minLength": 2
},
"lastName": {
"type": "string",
"maxLength": 10,
"minLength": 0,
"type": "string"
"minLength": 0
},
"email": {
"pattern": ".+@.+\\..+",
"type": "string"
"type": "string",
"pattern": ".+@.+\\..+"
},
"email1": {
"type": "string"
"type": "string",
"format": "email"
},
"age": {
"maximum": 30,
"minimum": 18,
"type": "integer",
"format": "int32"
"format": "int32",
"maximum": 30,
"minimum": 18
},
"creditCardNumber": {
"type": "string"
}
}
},
"required": [
"lastName"
]
}
}
}
}
}
6 changes: 3 additions & 3 deletions ...pi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ static class SpringDocTestApp {
/**
* Custom open api open api.
*
* @param appDesciption the app desciption
* @param appDescription the app description
* @param appVersion the app version
* @return the open api
*/
@Bean
public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) {
public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) {
return new OpenAPI()
.info(new Info()
.title("sample application API")
.version(appVersion)
.description(appDesciption)
.description(appDescription)
.termsOfService("http://swagger.io/terms/")
.license(new License().name("Apache 2.0").url("http://springdoc.org")));
}
Expand Down