Skip to content

Commit 90bc94a

Browse files
upgrade swagger-core from 2.2.53 to 2.2.54
1 parent d6c1ba3 commit 90bc94a

10 files changed

Lines changed: 8 additions & 15 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<central-publishing-maven-plugin.version>0.11.0
6060
</central-publishing-maven-plugin.version>
6161
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
62-
<swagger-api.version>2.2.53</swagger-api.version>
62+
<swagger-api.version>2.2.54</swagger-api.version>
6363
<swagger-ui.version>5.32.14</swagger-ui.version>
6464
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6565
<jjwt.version>0.9.1</jjwt.version>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,13 +565,10 @@ public SpringDocUtils addParentType(String... parentTypes) {
565565
* @return the spring doc utils
566566
*/
567567
public SpringDocUtils initExtraSchemas() {
568-
customClasses().put("java.time.Duration", PrimitiveType.STRING);
569-
customClasses().put("java.time.LocalTime", PrimitiveType.STRING);
570568
customClasses().put("java.time.YearMonth", PrimitiveType.STRING);
571569
customClasses().put("java.time.MonthDay", PrimitiveType.STRING);
572570
customClasses().put("java.time.Year", PrimitiveType.STRING);
573571
customClasses().put("java.time.Period", PrimitiveType.STRING);
574-
customClasses().put("java.time.OffsetTime", PrimitiveType.STRING);
575572
customClasses().put("java.time.ZoneId", PrimitiveType.STRING);
576573
customClasses().put("java.time.ZoneOffset", PrimitiveType.STRING);
577574
customClasses().put("java.util.TimeZone", PrimitiveType.STRING);
@@ -586,13 +583,10 @@ public SpringDocUtils initExtraSchemas() {
586583
* @return the spring doc utils
587584
*/
588585
public SpringDocUtils resetExtraSchemas() {
589-
customClasses().remove("java.time.Duration");
590-
customClasses().remove("java.time.LocalTime");
591586
customClasses().remove("java.time.YearMonth");
592587
customClasses().remove("java.time.MonthDay");
593588
customClasses().remove("java.time.Year");
594589
customClasses().remove("java.time.Period");
595-
customClasses().remove("java.time.OffsetTime");
596590
customClasses().remove("java.time.ZoneId");
597591
customClasses().remove("java.time.ZoneOffset");
598592
customClasses().remove("java.util.TimeZone");

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
4747
Content content = response.getContent();
4848
if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) {
4949
Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema();
50-
schema.getProperties().clear();
5150
schema.types(Set.of("string"));
5251
}
5352
}

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"content": {
2424
"application/json": {
2525
"schema": {
26-
"type": "string"
26+
"type": "string",
27+
"format": "duration"
2728
}
2829
}
2930
}

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app115.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"application/json": {
2525
"schema": {
2626
"type": "string",
27-
"properties": {}
27+
"format": "duration"
2828
}
2929
}
3030
}

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"format": "date"
5757
},
5858
"localTime": {
59-
"type": "string"
59+
"type": "string",
60+
"format": "partial-time"
6061
},
6162
"yearMonth": {
6263
"type": "string"

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
5858
Content content = response.getContent();
5959
if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) {
6060
Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema();
61-
schema.getProperties().clear();
6261
schema.setType("string");
6362
}
6463
}

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
6060
if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) {
6161
Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema();
6262
schema.types(Set.of("string"));
63-
schema.getProperties().clear();
6463
}
6564
}
6665
}

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app115.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"application/json": {
3333
"schema": {
3434
"type": "string",
35-
"properties": {}
35+
"format": "duration"
3636
}
3737
}
3838
}

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app115.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"application/json": {
3333
"schema": {
3434
"type": "string",
35-
"properties": {}
35+
"format": "duration"
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)