From d78abd954a1069a324f3909c4363059b17b7a59f Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Sun, 6 Sep 2026 12:25:18 +0200 Subject: [PATCH] upgrade swagger-core from 2.2.53 to 2.2.54 --- pom.xml | 2 +- .../main/java/org/springdoc/core/utils/SpringDocUtils.java | 6 ------ .../api/v31/app115/JavaTimeOperationCustomizer.java | 1 - .../src/test/resources/results/3.0.1/app115.json | 3 ++- .../src/test/resources/results/3.1.0/app115.json | 2 +- .../src/test/resources/results/3.1.0/app243.json | 3 ++- .../api/v30/app115/JavaTimeOperationCustomizer.java | 1 - .../api/v31/app115/JavaTimeOperationCustomizer.java | 1 - .../src/test/resources/results/3.0.1/app115.json | 2 +- .../src/test/resources/results/3.1.0/app115.json | 2 +- 10 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 8dc9c19452..7df5ee9cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 0.11.0 1.5.0 - 2.2.53 + 2.2.54 5.32.14 1.13.1 0.9.1 diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java index 753025624a..fc904837c3 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java @@ -565,13 +565,10 @@ public SpringDocUtils addParentType(String... parentTypes) { * @return the spring doc utils */ public SpringDocUtils initExtraSchemas() { - customClasses().put("java.time.Duration", PrimitiveType.STRING); - customClasses().put("java.time.LocalTime", PrimitiveType.STRING); customClasses().put("java.time.YearMonth", PrimitiveType.STRING); customClasses().put("java.time.MonthDay", PrimitiveType.STRING); customClasses().put("java.time.Year", PrimitiveType.STRING); customClasses().put("java.time.Period", PrimitiveType.STRING); - customClasses().put("java.time.OffsetTime", PrimitiveType.STRING); customClasses().put("java.time.ZoneId", PrimitiveType.STRING); customClasses().put("java.time.ZoneOffset", PrimitiveType.STRING); customClasses().put("java.util.TimeZone", PrimitiveType.STRING); @@ -586,13 +583,10 @@ public SpringDocUtils initExtraSchemas() { * @return the spring doc utils */ public SpringDocUtils resetExtraSchemas() { - customClasses().remove("java.time.Duration"); - customClasses().remove("java.time.LocalTime"); customClasses().remove("java.time.YearMonth"); customClasses().remove("java.time.MonthDay"); customClasses().remove("java.time.Year"); customClasses().remove("java.time.Period"); - customClasses().remove("java.time.OffsetTime"); customClasses().remove("java.time.ZoneId"); customClasses().remove("java.time.ZoneOffset"); customClasses().remove("java.util.TimeZone"); diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java index 32e9be4e57..0ed502e2fd 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java @@ -47,7 +47,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) { Content content = response.getContent(); if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) { Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema(); - schema.getProperties().clear(); schema.types(Set.of("string")); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json index 82ae0ddf5f..b2728b733c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json @@ -23,7 +23,8 @@ "content": { "application/json": { "schema": { - "type": "string" + "type": "string", + "format": "duration" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app115.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app115.json index f3685cb970..322ede3ed9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app115.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app115.json @@ -24,7 +24,7 @@ "application/json": { "schema": { "type": "string", - "properties": {} + "format": "duration" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json index f332ddaea6..444a30ca98 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json @@ -56,7 +56,8 @@ "format": "date" }, "localTime": { - "type": "string" + "type": "string", + "format": "partial-time" }, "yearMonth": { "type": "string" diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java index 544878a196..9034b691d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java @@ -58,7 +58,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) { Content content = response.getContent(); if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) { Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema(); - schema.getProperties().clear(); schema.setType("string"); } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java index e891dcec79..6bc73c4b56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java @@ -60,7 +60,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) { if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) { Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema(); schema.types(Set.of("string")); - schema.getProperties().clear(); } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app115.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app115.json index 174ff999c5..cde841b582 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app115.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app115.json @@ -32,7 +32,7 @@ "application/json": { "schema": { "type": "string", - "properties": {} + "format": "duration" } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app115.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app115.json index 0525625811..0dc185f8f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app115.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app115.json @@ -32,7 +32,7 @@ "application/json": { "schema": { "type": "string", - "properties": {} + "format": "duration" } } }