From 5b543e3f507c36683602e90a019077fd078f680d Mon Sep 17 00:00:00 2001 From: Anna Shipil Date: Wed, 9 Sep 2026 10:55:34 +0200 Subject: [PATCH 1/3] DEVX-867: fixing postman ResourceRenderer for array with empty items (deprecated and etc) --- .../vrap/codegen/languages/postman/model/ResourceRenderer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/ResourceRenderer.kt b/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/ResourceRenderer.kt index 7c9e270a..ce5d0481 100644 --- a/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/ResourceRenderer.kt +++ b/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/ResourceRenderer.kt @@ -14,14 +14,14 @@ class ResourceRenderer { .plus(ActionRenderer().render(resource)) if ((resource.relativeUri.template.contains(resource.resourcePathName).not() && resource.relativeUriParameters.size > 0) || resource.resources.size == 0) { - return items.joinToString(",\n") + return items.filterNot { it.isBlank() }.joinToString(",\n") } return """ |{ | "name": "${resource.displayName?.value ?: resource.resourcePathName.firstUpperCase()}", | "description": "${resource.description?.description()}", | "item": [ - | <<${items.joinToString(",\n")}>> + | <<${items.filterNot { it.isBlank() }.joinToString(",\n")}>> | ] |} """.trimMargin() From 6b3e89a6e09ea1fafd5ea9ca073a4fec8ff4b023 Mon Sep 17 00:00:00 2001 From: Anna Shipil Date: Wed, 9 Sep 2026 11:00:44 +0200 Subject: [PATCH 2/3] DEVX-867: fixing postman PostmanModuleRenderer for empty resources --- .../codegen/languages/postman/model/PostmanModuleRenderer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/PostmanModuleRenderer.kt b/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/PostmanModuleRenderer.kt index 3b62153d..09932b92 100644 --- a/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/PostmanModuleRenderer.kt +++ b/languages/postman/src/main/kotlin/io/vrap/codegen/languages/postman/model/PostmanModuleRenderer.kt @@ -79,7 +79,7 @@ class PostmanModuleRenderer constructor(val api: Api, override val vrapTypeProvi | <<${auth()}>>, | "item": [ | <<${authorization(api.oAuth2())}>>, - | <<${api.resources.joinToString(",") { ResourceRenderer().render(it) }}>> + | <<${api.resources.map { ResourceRenderer().render(it) }.filterNot { it.isBlank() }.joinToString(",")}>> | ] |} """.trimMargin().keepAngleIndent()) From a8c0b8b054bc424f504a403053daeab03ac747b1 Mon Sep 17 00:00:00 2001 From: Anna Shipil Date: Wed, 9 Sep 2026 11:22:20 +0200 Subject: [PATCH 3/3] DEVX-867: fixing php issue with file type --- .../main/kotlin/io/vrap/codegen/languages/php/PhpBaseTypes.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/php/src/main/kotlin/io/vrap/codegen/languages/php/PhpBaseTypes.kt b/languages/php/src/main/kotlin/io/vrap/codegen/languages/php/PhpBaseTypes.kt index ab90dd9a..9c33718b 100644 --- a/languages/php/src/main/kotlin/io/vrap/codegen/languages/php/PhpBaseTypes.kt +++ b/languages/php/src/main/kotlin/io/vrap/codegen/languages/php/PhpBaseTypes.kt @@ -13,7 +13,7 @@ object PhpBaseTypes : LanguageBaseTypes( dateTimeType = fromDateTimeType("","DateTimeImmutable", DateTimeTypes.DateTime), dateOnlyType = fromDateTimeType("","DateTimeImmutable",DateTimeTypes.DateOnly), timeOnlyType = fromDateTimeType("","DateTimeImmutable",DateTimeTypes.TimeOnly), - file = fromPhpType("","File") + file = fromScalarPhpType("string") ) fun fromDateTimeType(`package`: String, simpleName: String, dateTimeType: DateTimeTypes):VrapDateTimeType{