Skip to content

Commit 030be5d

Browse files
authored
fix(java): handle validation of UUIDs (#21747)
relates to #16868
1 parent 2bbb19a commit 030be5d

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
134134
{{/isNumber}}
135135
{{^isNumber}}
136136
{{^isPrimitiveType}}
137+
{{#isUuid}}
138+
UUID.fromString(jsonElement.getAsString());
139+
{{/isUuid}}
140+
{{^isUuid}}
137141
{{{dataType}}}.validateJsonElement(jsonElement);
142+
{{/isUuid}}
138143
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
139144
{{/isPrimitiveType}}
140145
{{/isNumber}}
@@ -328,7 +333,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
328333
{{/isNumber}}
329334
{{^isNumber}}
330335
{{^isPrimitiveType}}
336+
{{#isUuid}}
337+
UUID.fromString(jsonElement.getAsString());
338+
{{/isUuid}}
339+
{{^isUuid}}
331340
{{{dataType}}}.validateJsonElement(jsonElement);
341+
{{/isUuid}}
332342
{{/isPrimitiveType}}
333343
{{/isNumber}}
334344
{{/isArray}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
175175
{{/isNumber}}
176176
{{^isNumber}}
177177
{{^isPrimitiveType}}
178+
{{#isUuid}}
179+
UUID.fromString(jsonElement.getAsString());
180+
{{/isUuid}}
181+
{{^isUuid}}
178182
{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.validateJsonElement(jsonElement);
183+
{{/isUuid}}
179184
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
180185
{{/isPrimitiveType}}
181186
{{/isNumber}}
@@ -408,7 +413,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
408413
{{/isNumber}}
409414
{{^isNumber}}
410415
{{^isPrimitiveType}}
416+
{{#isUuid}}
417+
UUID.fromString(jsonElement.getAsString());
418+
{{/isUuid}}
419+
{{^isUuid}}
411420
{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}.validateJsonElement(jsonElement);
421+
{{/isUuid}}
412422
{{/isPrimitiveType}}
413423
{{/isNumber}}
414424
{{/isArray}}

0 commit comments

Comments
 (0)