fix issues with more incorrectly escaped values

Author: Picazsoo

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache

@@ -264,7 +264,7 @@ import {{packageName}}.infrastructure.Serializer
 
         return RequestConfig(
             method = RequestMethod.{{httpMethod}},
-            path = "{{{path}}}"{{#pathParams}}.replace("{"+"{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"+"}", encodeURIComponent({{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}.toString(){{/isContainer}})){{/pathParams}},
+            path = "{{#lambda.escapeInNormalString}}{{{path}}}{{/lambda.escapeInNormalString}}"{{#pathParams}}.replace("{"+"{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"+"}", encodeURIComponent({{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}.toString(){{/isContainer}})){{/pathParams}},
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}},

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

@@ -127,13 +127,13 @@ import {{packageName}}.infrastructure.*
 
         val params = mutableMapOf<String, Any>(
         {{#pathParams}}
-            "{{baseName}}" to {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}{{/isContainer}},
+            "{{#lambda.escapeInNormalString}}{{baseName}}{{/lambda.escapeInNormalString}}" to {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}{{/isContainer}},
         {{/pathParams}}
         )
 
         return RequestConfig(
             method = RequestMethod.{{httpMethod}},
-            path = "{{{path}}}",
+            path = "{{#lambda.escapeInNormalString}}{{{path}}}{{/lambda.escapeInNormalString}}",
             params = params,
             query = localVariableQuery,
             headers = localVariableHeaders,

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

@@ -129,13 +129,13 @@ import {{packageName}}.infrastructure.*
 
         val params = mutableMapOf<String, Any>(
         {{#pathParams}}
-            "{{baseName}}" to {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}{{/isContainer}},
+            "{{#lambda.escapeInNormalString}}{{baseName}}{{/lambda.escapeInNormalString}}" to {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}{{/isContainer}},
         {{/pathParams}}
         )
 
         return RequestConfig(
             method = RequestMethod.{{httpMethod}},
-            path = "{{{path}}}",
+            path = "{{#lambda.escapeInNormalString}}{{{path}}}{{/lambda.escapeInNormalString}}",
             params = params,
             query = localVariableQuery,
             headers = localVariableHeaders,

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/api.mustache

@@ -63,7 +63,7 @@ import {{packageName}}.infrastructure.CollectionFormats.*
         // to make it easy to override with your own.
 
         // create path and map variables
-        val path = "{{{path}}}"{{#pathParams}}.replace("{" + "{{baseName}}" + "}", {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}IRequestFactory.escapeString({{{paramName}}}.toString()){{/isContainer}}){{/pathParams}}
+        val path = "{{#lambda.escapeInNormalString}}{{{path}}}{{/lambda.escapeInNormalString}}"{{#pathParams}}.replace("{" + "{{#lambda.escapeInNormalString}}{{baseName}}{{/lambda.escapeInNormalString}}" + "}", {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}IRequestFactory.escapeString({{{paramName}}}.toString()){{/isContainer}}){{/pathParams}}
 
         val formParams = mapOf<String, String>({{^formParams}}){{/formParams}}{{#formParams}}
             "{{baseName}}" to IRequestFactory.parameterToString({{paramName}}){{^-last}},{{/-last}}{{#-last}}

samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/apis/EchoApi.kt

@@ -125,7 +125,7 @@ open class EchoApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto
 
         return RequestConfig(
             method = RequestMethod.GET,
-            path = "/echo/string-escaping/{$paramName}".replace("{"+"\$paramName"+"}", encodeURIComponent(dollarParamName.toString())),
+            path = "/echo/string-escaping/{\$paramName}".replace("{"+"\$paramName"+"}", encodeURIComponent(dollarParamName.toString())),
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,

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

@@ -70,12 +70,12 @@ open class EchoApi(client: RestClient) : ApiClient(client) {
         localVariableHeaders["Accept"] = "text/plain"
 
         val params = mutableMapOf<String, Any>(
-            "$paramName" to dollarParamName,
+            "\$paramName" to dollarParamName,
         )
 
         return RequestConfig(
             method = RequestMethod.GET,
-            path = "/echo/string-escaping/{$paramName}",
+            path = "/echo/string-escaping/{\$paramName}",
             params = params,
             query = localVariableQuery,
             headers = localVariableHeaders,

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

@@ -74,12 +74,12 @@ open class EchoApi(client: WebClient) : ApiClient(client) {
         localVariableHeaders["Accept"] = "text/plain"
 
         val params = mutableMapOf<String, Any>(
-            "$paramName" to dollarParamName,
+            "\$paramName" to dollarParamName,
         )
 
         return RequestConfig(
             method = RequestMethod.GET,
-            path = "/echo/string-escaping/{$paramName}",
+            path = "/echo/string-escaping/{\$paramName}",
             params = params,
             query = localVariableQuery,
             headers = localVariableHeaders,