From 82b547f90f8fcb63d7a9895f12649f38f26d2032 Mon Sep 17 00:00:00 2001 From: Ruben Hoenle Date: Thu, 14 Aug 2025 11:18:46 +0200 Subject: [PATCH] fix(java): handle validation of UUIDs relates to OpenAPITools/openapi-generator#16868 --- .../Java/libraries/okhttp-gson/anyof_model.mustache | 10 ++++++++++ .../Java/libraries/okhttp-gson/oneof_model.mustache | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache index 8c15d70b1954..f60425d3c880 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache @@ -134,7 +134,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNumber}} {{^isNumber}} {{^isPrimitiveType}} + {{#isUuid}} + UUID.fromString(jsonElement.getAsString()); + {{/isUuid}} + {{^isUuid}} {{{dataType}}}.validateJsonElement(jsonElement); + {{/isUuid}} actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; {{/isPrimitiveType}} {{/isNumber}} @@ -328,7 +333,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNumber}} {{^isNumber}} {{^isPrimitiveType}} + {{#isUuid}} + UUID.fromString(jsonElement.getAsString()); + {{/isUuid}} + {{^isUuid}} {{{dataType}}}.validateJsonElement(jsonElement); + {{/isUuid}} {{/isPrimitiveType}} {{/isNumber}} {{/isArray}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache index a92376ba1653..8f0516b5b9af 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache @@ -175,7 +175,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNumber}} {{^isNumber}} {{^isPrimitiveType}} + {{#isUuid}} + UUID.fromString(jsonElement.getAsString()); + {{/isUuid}} + {{^isUuid}} {{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.validateJsonElement(jsonElement); + {{/isUuid}} actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; {{/isPrimitiveType}} {{/isNumber}} @@ -408,7 +413,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNumber}} {{^isNumber}} {{^isPrimitiveType}} + {{#isUuid}} + UUID.fromString(jsonElement.getAsString()); + {{/isUuid}} + {{^isUuid}} {{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.validateJsonElement(jsonElement); + {{/isUuid}} {{/isPrimitiveType}} {{/isNumber}} {{/isArray}}