Skip to content

Commit 126ac09

Browse files
TooaTooa
committed
fix: resolve broken string interpolation
1 parent f2ad1ec commit 126ac09

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

  • modules/openapi-generator/src/main/resources/kotlin-client/libraries
  • samples/client/echo_api
    • kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/apis
    • kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis

‎modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/api.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,17 @@ import {{packageName}}.infrastructure.*
101101
{{#queryParams}}
102102
{{^required}}
103103
if ({{{paramName}}} != null) {
104-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
104+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
105105
}
106106
{{/required}}
107107
{{#required}}
108108
{{#isNullable}}
109109
if ({{{paramName}}} != null) {
110-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
110+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
111111
}
112112
{{/isNullable}}
113113
{{^isNullable}}
114-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
114+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
115115
{{/isNullable}}
116116
{{/required}}
117117
{{/queryParams}}

‎modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-webclient/api.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,17 @@ import {{packageName}}.infrastructure.*
103103
{{#queryParams}}
104104
{{^required}}
105105
if ({{{paramName}}} != null) {
106-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
106+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
107107
}
108108
{{/required}}
109109
{{#required}}
110110
{{#isNullable}}
111111
if ({{{paramName}}} != null) {
112-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
112+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
113113
}
114114
{{/isNullable}}
115115
{{^isNullable}}
116-
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${{{paramName}}}.value}"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
116+
put("{{baseName}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{^isDateTime}}{{^isDate}}{{#isEnumOrRef}}"${ {{paramName}}.value }"{{/isEnumOrRef}}{{^isEnumOrRef}}"${{{paramName}}}"{{/isEnumOrRef}}{{/isDate}}{{/isDateTime}}){{/isContainer}})
117117
{{/isNullable}}
118118
{{/required}}
119119
{{/queryParams}}

‎samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/apis/QueryApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ open class QueryApi(client: RestClient) : ApiClient(client) {
6767
val localVariableQuery = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
6868
.apply {
6969
if (enumNonrefStringQuery != null) {
70-
put("enum_nonref_string_query", listOf("$enumNonrefStringQuery.value}"))
70+
put("enum_nonref_string_query", listOf("${ enumNonrefStringQuery.value }"))
7171
}
7272
if (enumRefStringQuery != null) {
73-
put("enum_ref_string_query", listOf("$enumRefStringQuery.value}"))
73+
put("enum_ref_string_query", listOf("${ enumRefStringQuery.value }"))
7474
}
7575
}
7676
val localVariableHeaders: MutableMap<String, String> = mutableMapOf()

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/QueryApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ open class QueryApi(client: WebClient) : ApiClient(client) {
7171
val localVariableQuery = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
7272
.apply {
7373
if (enumNonrefStringQuery != null) {
74-
put("enum_nonref_string_query", listOf("$enumNonrefStringQuery.value}"))
74+
put("enum_nonref_string_query", listOf("${ enumNonrefStringQuery.value }"))
7575
}
7676
if (enumRefStringQuery != null) {
77-
put("enum_ref_string_query", listOf("$enumRefStringQuery.value}"))
77+
put("enum_ref_string_query", listOf("${ enumRefStringQuery.value }"))
7878
}
7979
}
8080
val localVariableHeaders: MutableMap<String, String> = mutableMapOf()

0 commit comments

Comments
 (0)