Skip to content

[Kotlin] Primitive array items validity check #21315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
May 27, 2025
Merged

[Kotlin] Primitive array items validity check #21315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e9ede6
Primitive array items validity check
andreas-umbricht May 22, 2025
91b897c
Update samples
andreas-umbricht May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,16 @@ import {{packageName}}.infrastructure.ITransformForStorage
String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
}
{{/required}}
{{#items.isPrimitiveType}}
// ensure the items in json array are primitive
if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null) {
for (i in 0 until jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").size()) {
require(jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").get(i).isJsonPrimitive) {
String.format("Expected the property in array `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be primitive")
}
}
}
{{/items.isPrimitiveType}}
{{/items.isModel}}
{{/isArray}}
{{^isContainer}}
Expand Down
8 changes: 8 additions & 0 deletions ...otlin-model-prefix-type-mappings/src/main/kotlin/org/openapitools/client/models/ApiPet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,14 @@ data class ApiPet (
require(jsonObj["photoUrls"].isJsonArray()) {
String.format("Expected the field `photoUrls` to be an array in the JSON string but got `%s`", jsonObj["photoUrls"].toString())
}
// ensure the items in json array are primitive
if (jsonObj["photoUrls"] != null) {
for (i in 0 until jsonObj.getAsJsonArray("photoUrls").size()) {
require(jsonObj.getAsJsonArray("photoUrls").get(i).isJsonPrimitive) {
String.format("Expected the property in array `photoUrls` to be primitive")
}
}
}
// validate the optional field `category`
if (jsonObj["category"] != null && !jsonObj["category"].isJsonNull) {
ApiCategory.validateJsonElement(jsonObj["category"])
Expand Down
Loading