From 406d00fe9b0767d91b305346c0fdc736a43b292d Mon Sep 17 00:00:00 2001 From: Gabriel Feo Date: Mon, 22 Apr 2024 07:31:35 +0100 Subject: [PATCH] [kotlin] Fix model imports when using exploded query params (#18440) * Fix model package import * Fix typo * Add missing properties to docs * Revert "Add missing properties to docs" This reverts commit 67a68f9ea7e4053d7955814f13e76f0e382bf191. --- .../openapitools/codegen/languages/KotlinClientCodegen.java | 2 +- .../kotlin-client/libraries/jvm-retrofit2/api.mustache | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index c2dd6a40516..51a325bd9e6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -957,7 +957,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { if (param.isQueryParam && "form".equals(param.style) && param.isExplode && param.isModel) { // query parameter (style: form, explode) referencing models need to import // models defined in the properties of the models - operations.put("x-koltin-import-models", true); + operations.put("x-kotlin-import-models", true); } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache index 8576bee5b43..d99122333d6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache @@ -59,10 +59,10 @@ import kotlinx.serialization.* {{/imports}} {{#operations}} -{{#x-koltin-import-models}} -import {{{packageName}}}.models.* +{{#x-kotlin-import-models}} +import {{{modelPackage}}}.* -{{/x-koltin-import-models}} +{{/x-kotlin-import-models}} {{#x-kotlin-multipart-import}} {{^isMultipart}} import okhttp3.MultipartBody