Merge backport of #3351 - swagger-core 2.2.54

swagger-core now resolves java.time.Duration, LocalTime and OffsetTime
itself (swagger-api/swagger-core#5184), so the corresponding entries of
initExtraSchemas can be dropped.

Author: bnasslahsen

CHANGELOG.md

@@ -23,7 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **The Scalar starters no longer register forwarded-header handling.** Set `server.forward-headers-strategy=framework` (or `native`) behind a trusted proxy
 - Add `springdoc.cache.max-entries` (default `100`) to bound the per-locale OpenAPI cache
 - Document the security policy and the release versioning scheme
-- Upgrade swagger-core to version **2.2.53**
+- #3351 – `java.time.Duration`, `LocalTime` and `OffsetTime` are now resolved by swagger-core instead of being forced to a bare `string`, so they carry a `format` (`duration` and `partial-time` respectively for the first two)
+- Upgrade swagger-core to version **2.2.54**
 - Upgrade swagger-ui to version **5.32.14**
 
 ### Fixed

pom.xml

@@ -56,7 +56,7 @@
 		<central-publishing-maven-plugin.version>0.11.0
 		</central-publishing-maven-plugin.version>
 		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-		<swagger-api.version>2.2.53</swagger-api.version>
+		<swagger-api.version>2.2.54</swagger-api.version>
 		<swagger-ui.version>5.32.14</swagger-ui.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jjwt.version>0.9.1</jjwt.version>

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

@@ -563,13 +563,10 @@ public SpringDocUtils addParentType(String... parentTypes) {
 	 * Init extra schemas.
 	 */
 	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);
@@ -584,13 +581,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");

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"));
 				}
 			}

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"
                 }
               }
             }

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"
                 }
               }
             }

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"

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");
 				}
 			}

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();
 				}
 			}
 		}

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"
                 }
               }
             }