Fix integer default value with double quote (kotlin jaxrs server generator) (#16563)

* fix integer default value with double qutoe (kotlin jaxrs) * add enum tests * fix typo * update samples
2023-09-12 17:38:51 +08:00 · 2023-09-12 17:38:51 +08:00 · 9c4f6c46f7
commit 9c4f6c46f7
parent a5f79a7bdc
11 changed files with 180 additions and 12 deletions
--- a/.gitignore
+++ b/.gitignore
@ -212,6 +212,7 @@ samples/server/petstore/kotlin-server/ktor/build
 samples/server/petstore/kotlin-springboot/build
 samples/client/petstore/kotlin*/src/main/kotlin/test/
 samples/client/petstore/kotlin*/build/
+samples/server/others/kotlin-server/jaxrs-spec/build/

 # haskell
 .stack-work
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@ -449,6 +449,7 @@ public class DefaultCodegen implements CodegenConfig {
                .put("pascalcase", new CamelCaseLambda(false).generator(this))
                .put("forwardslash", new ForwardSlashLambda())
                .put("backslash", new BackSlashLambda())
+                .put("doublequote", new DoubleQuoteLambda())
                .put("indented", new IndentedLambda())
                .put("indented_8", new IndentedLambda(8, " ", false))
                .put("indented_12", new IndentedLambda(12, " ", false))
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/DoubleQuoteLambda.java
@ -0,0 +1,50 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.templating.mustache;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import static org.openapitools.codegen.utils.StringUtils.underscore;
+
+/**
+ * Double quote the text if it's not already the case.
+ *
+ * Register:
+ * <pre>
+ * additionalProperties.put("doublequote", new DoubleQuoteLambda());
+ * </pre>
+ *
+ * Use:
+ * <pre>
+ * {{#doublequote}}{{summary}}{{/doublequote}}
+ * </pre>
+ */
+public class DoubleQuoteLambda implements Mustache.Lambda {
+    @Override
+    public void execute(Template.Fragment fragment, Writer writer) throws IOException {
+        String input = fragment.execute();
+        if (input.startsWith("\"") && input.endsWith("\"")) {
+            writer.write(input);
+        } else {
+            writer.write("\"" + input + "\"");
+        }
+    }
+}
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java
@ -34,7 +34,7 @@ import static org.openapitools.codegen.utils.StringUtils.underscore;
 *
 * Use:
 * <pre>
- * {{#fforwardslash}}{{summary}}{{/forwardslash}}
+ * {{#forwardslash}}{{summary}}{{/forwardslash}}
 * </pre>
 */
 public class ForwardSlashLambda implements Mustache.Lambda {
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/cookieParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/cookieParams.mustache
@ -1 +1 @@
-{{#isCookieParam}}@CookieParam("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue({{{.}}}){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}} {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isCookieParam}}
+{{#isCookieParam}}@CookieParam("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue({{#lambda.doublequote}}{{{.}}}{{/lambda.doublequote}}){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}} {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isCookieParam}}
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/headerParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/headerParams.mustache
@ -1 +1 @@
-{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}} {{#defaultValue}} @DefaultValue({{{.}}}){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}} {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isHeaderParam}}
+{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}} {{#defaultValue}} @DefaultValue({{#lambda.doublequote}}{{{.}}}{{/lambda.doublequote}}){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}} {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isHeaderParam}}
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/queryParams.mustache
@ -1 +1 @@
-{{#isQueryParam}}@QueryParam("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue({{{.}}}){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}  {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isQueryParam}}
+{{#isQueryParam}}@QueryParam("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue({{#lambda.doublequote}}{{{.}}}{{/lambda.doublequote}}){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}  {{paramName}}: {{{dataType}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}{{^required}}?{{/required}}{{/defaultValue}}{{/isNullable}}{{/isQueryParam}}
--- a/modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/parameter-test-spec.yaml
@ -24,12 +24,46 @@ paths:
          schema:
            type: string
            default: available
+        - name: query_default_enum
+          in: query
+          description: query default enum
+          schema:
+            type: string
+            enum:
+              - A
+              - B
+              - C
+            default: B
+        - name: query_default_int
+          in: query
+          description: query default int
+          schema:
+            type: number
+            format: int32
+            default: 3
        - name: header_default
          in: header
          description: header default
          schema:
            type: string
            default: available
+        - name: header_default_enum
+          in: header
+          description: header default enum
+          schema:
+            type: string
+            enum:
+              - A
+              - B
+              - C
+            default: B
+        - name: header_default_int
+          in: header
+          description: header default int
+          schema:
+            type: number
+            format: int32
+            default: 3
        - name: path_default
          in: path
          description: path default
@ -42,6 +76,23 @@ paths:
          schema:
            type: string
            default: available
+        - name: cookie_default_enum
+          in: cookie
+          description: cookie default enum
+          schema:
+            type: string
+            enum:
+              - A
+              - B
+              - C
+            default: B
+        - name: cookie_default_int
+          in: cookie
+          description: cookie default int
+          schema:
+            type: number
+            format: int32
+            default: 3
        - name: query_nullable
          in: query
          description: query nullable
--- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/docs/DefaultApi.md
+++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/docs/DefaultApi.md
@ -9,7 +9,7 @@ Method | HTTP request | Description

 <a id="findPetsByStatus"></a>
 # **findPetsByStatus**
-> findPetsByStatus(pathDefault, pathNullable, queryDefault, headerDefault, cookieDefault, queryNullable, headerNullable, cookieNullable, dollarQueryDollarDollarSign)
+> findPetsByStatus(pathDefault, pathNullable, queryDefault, queryDefaultEnum, queryDefaultInt, headerDefault, headerDefaultEnum, headerDefaultInt, cookieDefault, cookieDefaultEnum, cookieDefaultInt, queryNullable, headerNullable, cookieNullable, dollarQueryDollarDollarSign)

 Finds Pets by status

@ -25,14 +25,20 @@ val apiInstance = DefaultApi()
 val pathDefault : kotlin.String = pathDefault_example // kotlin.String | path default
 val pathNullable : kotlin.String = pathNullable_example // kotlin.String | path_nullable
 val queryDefault : kotlin.String = queryDefault_example // kotlin.String | query default
+val queryDefaultEnum : kotlin.String = queryDefaultEnum_example // kotlin.String | query default enum
+val queryDefaultInt : java.math.BigDecimal = 8.14 // java.math.BigDecimal | query default int
 val headerDefault : kotlin.String = headerDefault_example // kotlin.String | header default
+val headerDefaultEnum : kotlin.String = headerDefaultEnum_example // kotlin.String | header default enum
+val headerDefaultInt : java.math.BigDecimal = 8.14 // java.math.BigDecimal | header default int
 val cookieDefault : kotlin.String = cookieDefault_example // kotlin.String | cookie default
+val cookieDefaultEnum : kotlin.String = cookieDefaultEnum_example // kotlin.String | cookie default enum
+val cookieDefaultInt : java.math.BigDecimal = 8.14 // java.math.BigDecimal | cookie default int
 val queryNullable : kotlin.String = queryNullable_example // kotlin.String | query nullable
 val headerNullable : kotlin.String = headerNullable_example // kotlin.String | header nullable
 val cookieNullable : kotlin.String = cookieNullable_example // kotlin.String | cookie_nullable
 val dollarQueryDollarDollarSign : kotlin.String = dollarQueryDollarDollarSign_example // kotlin.String | query parameter with dollar sign
 try {
-    apiInstance.findPetsByStatus(pathDefault, pathNullable, queryDefault, headerDefault, cookieDefault, queryNullable, headerNullable, cookieNullable, dollarQueryDollarDollarSign)
+    apiInstance.findPetsByStatus(pathDefault, pathNullable, queryDefault, queryDefaultEnum, queryDefaultInt, headerDefault, headerDefaultEnum, headerDefaultInt, cookieDefault, cookieDefaultEnum, cookieDefaultInt, queryNullable, headerNullable, cookieNullable, dollarQueryDollarDollarSign)
 } catch (e: ClientException) {
    println("4xx response calling DefaultApi#findPetsByStatus")
    e.printStackTrace()
@ -49,8 +55,14 @@ Name | Type | Description  | Notes
 **pathDefault** | **kotlin.String**| path default |
 **pathNullable** | **kotlin.String**| path_nullable |
 **queryDefault** | **kotlin.String**| query default | [optional] [default to &quot;available&quot;]
+ **queryDefaultEnum** | **kotlin.String**| query default enum | [optional] [default to B] [enum: A, B, C]
+ **queryDefaultInt** | **java.math.BigDecimal**| query default int | [optional] [default to 3]
 **headerDefault** | **kotlin.String**| header default | [optional] [default to &quot;available&quot;]
+ **headerDefaultEnum** | **kotlin.String**| header default enum | [optional] [default to B] [enum: A, B, C]
+ **headerDefaultInt** | **java.math.BigDecimal**| header default int | [optional] [default to 3]
 **cookieDefault** | **kotlin.String**| cookie default | [optional] [default to &quot;available&quot;]
+ **cookieDefaultEnum** | **kotlin.String**| cookie default enum | [optional] [default to B] [enum: A, B, C]
+ **cookieDefaultInt** | **java.math.BigDecimal**| cookie default int | [optional] [default to 3]
 **queryNullable** | **kotlin.String**| query nullable | [optional]
 **headerNullable** | **kotlin.String**| header nullable | [optional]
 **cookieNullable** | **kotlin.String**| cookie_nullable | [optional]
--- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
@ -44,14 +44,47 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
        }
    }

+    /**
+     * enum for parameter queryDefaultEnum
+     */
+     enum class QueryDefaultEnumFindPetsByStatus(val value: kotlin.String) {
+         @Json(name = "A") a("A"),
+         @Json(name = "B") b("B"),
+         @Json(name = "C") c("C")
+     }
+
+    /**
+     * enum for parameter headerDefaultEnum
+     */
+     enum class HeaderDefaultEnumFindPetsByStatus(val value: kotlin.String) {
+         @Json(name = "A") a("A"),
+         @Json(name = "B") b("B"),
+         @Json(name = "C") c("C")
+     }
+
+    /**
+     * enum for parameter cookieDefaultEnum
+     */
+     enum class CookieDefaultEnumFindPetsByStatus(val value: kotlin.String) {
+         @Json(name = "A") a("A"),
+         @Json(name = "B") b("B"),
+         @Json(name = "C") c("C")
+     }
+
    /**
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param pathDefault path default
     * @param pathNullable path_nullable
     * @param queryDefault query default (optional, default to "available")
+     * @param queryDefaultEnum query default enum (optional, default to B)
+     * @param queryDefaultInt query default int (optional, default to 3)
     * @param headerDefault header default (optional, default to "available")
+     * @param headerDefaultEnum header default enum (optional, default to B)
+     * @param headerDefaultInt header default int (optional, default to 3)
     * @param cookieDefault cookie default (optional, default to "available")
+     * @param cookieDefaultEnum cookie default enum (optional, default to B)
+     * @param cookieDefaultInt cookie default int (optional, default to 3)
     * @param queryNullable query nullable (optional)
     * @param headerNullable header nullable (optional)
     * @param cookieNullable cookie_nullable (optional)
@ -64,8 +97,8 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
     * @throws ServerException If the API returns a server error response
     */
    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String? = "available", headerDefault: kotlin.String? = "available", cookieDefault: kotlin.String? = "available", queryNullable: kotlin.String? = null, headerNullable: kotlin.String? = null, cookieNullable: kotlin.String? = null, dollarQueryDollarDollarSign: kotlin.String? = null) : Unit {
-        val localVarResponse = findPetsByStatusWithHttpInfo(pathDefault = pathDefault, pathNullable = pathNullable, queryDefault = queryDefault, headerDefault = headerDefault, cookieDefault = cookieDefault, queryNullable = queryNullable, headerNullable = headerNullable, cookieNullable = cookieNullable, dollarQueryDollarDollarSign = dollarQueryDollarDollarSign)
+    fun findPetsByStatus(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String? = "available", queryDefaultEnum: QueryDefaultEnumFindPetsByStatus? = QueryDefaultEnumFindPetsByStatus.b, queryDefaultInt: java.math.BigDecimal? = java.math.BigDecimal("3"), headerDefault: kotlin.String? = "available", headerDefaultEnum: HeaderDefaultEnumFindPetsByStatus? = HeaderDefaultEnumFindPetsByStatus.b, headerDefaultInt: java.math.BigDecimal? = java.math.BigDecimal("3"), cookieDefault: kotlin.String? = "available", cookieDefaultEnum: CookieDefaultEnumFindPetsByStatus? = CookieDefaultEnumFindPetsByStatus.b, cookieDefaultInt: java.math.BigDecimal? = java.math.BigDecimal("3"), queryNullable: kotlin.String? = null, headerNullable: kotlin.String? = null, cookieNullable: kotlin.String? = null, dollarQueryDollarDollarSign: kotlin.String? = null) : Unit {
+        val localVarResponse = findPetsByStatusWithHttpInfo(pathDefault = pathDefault, pathNullable = pathNullable, queryDefault = queryDefault, queryDefaultEnum = queryDefaultEnum, queryDefaultInt = queryDefaultInt, headerDefault = headerDefault, headerDefaultEnum = headerDefaultEnum, headerDefaultInt = headerDefaultInt, cookieDefault = cookieDefault, cookieDefaultEnum = cookieDefaultEnum, cookieDefaultInt = cookieDefaultInt, queryNullable = queryNullable, headerNullable = headerNullable, cookieNullable = cookieNullable, dollarQueryDollarDollarSign = dollarQueryDollarDollarSign)

        return when (localVarResponse.responseType) {
            ResponseType.Success -> Unit
@ -88,8 +121,14 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
     * @param pathDefault path default
     * @param pathNullable path_nullable
     * @param queryDefault query default (optional, default to "available")
+     * @param queryDefaultEnum query default enum (optional, default to B)
+     * @param queryDefaultInt query default int (optional, default to 3)
     * @param headerDefault header default (optional, default to "available")
+     * @param headerDefaultEnum header default enum (optional, default to B)
+     * @param headerDefaultInt header default int (optional, default to 3)
     * @param cookieDefault cookie default (optional, default to "available")
+     * @param cookieDefaultEnum cookie default enum (optional, default to B)
+     * @param cookieDefaultInt cookie default int (optional, default to 3)
     * @param queryNullable query nullable (optional)
     * @param headerNullable header nullable (optional)
     * @param cookieNullable cookie_nullable (optional)
@ -99,8 +138,8 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
     * @throws IOException Rethrows the OkHttp execute method exception
     */
    @Throws(IllegalStateException::class, IOException::class)
-    fun findPetsByStatusWithHttpInfo(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String?, headerDefault: kotlin.String?, cookieDefault: kotlin.String?, queryNullable: kotlin.String?, headerNullable: kotlin.String?, cookieNullable: kotlin.String?, dollarQueryDollarDollarSign: kotlin.String?) : ApiResponse<Unit?> {
-        val localVariableConfig = findPetsByStatusRequestConfig(pathDefault = pathDefault, pathNullable = pathNullable, queryDefault = queryDefault, headerDefault = headerDefault, cookieDefault = cookieDefault, queryNullable = queryNullable, headerNullable = headerNullable, cookieNullable = cookieNullable, dollarQueryDollarDollarSign = dollarQueryDollarDollarSign)
+    fun findPetsByStatusWithHttpInfo(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String?, queryDefaultEnum: QueryDefaultEnumFindPetsByStatus?, queryDefaultInt: java.math.BigDecimal?, headerDefault: kotlin.String?, headerDefaultEnum: HeaderDefaultEnumFindPetsByStatus?, headerDefaultInt: java.math.BigDecimal?, cookieDefault: kotlin.String?, cookieDefaultEnum: CookieDefaultEnumFindPetsByStatus?, cookieDefaultInt: java.math.BigDecimal?, queryNullable: kotlin.String?, headerNullable: kotlin.String?, cookieNullable: kotlin.String?, dollarQueryDollarDollarSign: kotlin.String?) : ApiResponse<Unit?> {
+        val localVariableConfig = findPetsByStatusRequestConfig(pathDefault = pathDefault, pathNullable = pathNullable, queryDefault = queryDefault, queryDefaultEnum = queryDefaultEnum, queryDefaultInt = queryDefaultInt, headerDefault = headerDefault, headerDefaultEnum = headerDefaultEnum, headerDefaultInt = headerDefaultInt, cookieDefault = cookieDefault, cookieDefaultEnum = cookieDefaultEnum, cookieDefaultInt = cookieDefaultInt, queryNullable = queryNullable, headerNullable = headerNullable, cookieNullable = cookieNullable, dollarQueryDollarDollarSign = dollarQueryDollarDollarSign)

        return request<Unit, Unit>(
            localVariableConfig
@ -113,21 +152,33 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
     * @param pathDefault path default
     * @param pathNullable path_nullable
     * @param queryDefault query default (optional, default to "available")
+     * @param queryDefaultEnum query default enum (optional, default to B)
+     * @param queryDefaultInt query default int (optional, default to 3)
     * @param headerDefault header default (optional, default to "available")
+     * @param headerDefaultEnum header default enum (optional, default to B)
+     * @param headerDefaultInt header default int (optional, default to 3)
     * @param cookieDefault cookie default (optional, default to "available")
+     * @param cookieDefaultEnum cookie default enum (optional, default to B)
+     * @param cookieDefaultInt cookie default int (optional, default to 3)
     * @param queryNullable query nullable (optional)
     * @param headerNullable header nullable (optional)
     * @param cookieNullable cookie_nullable (optional)
     * @param dollarQueryDollarDollarSign query parameter with dollar sign (optional)
     * @return RequestConfig
     */
-    fun findPetsByStatusRequestConfig(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String?, headerDefault: kotlin.String?, cookieDefault: kotlin.String?, queryNullable: kotlin.String?, headerNullable: kotlin.String?, cookieNullable: kotlin.String?, dollarQueryDollarDollarSign: kotlin.String?) : RequestConfig<Unit> {
+    fun findPetsByStatusRequestConfig(pathDefault: kotlin.String, pathNullable: kotlin.String, queryDefault: kotlin.String?, queryDefaultEnum: QueryDefaultEnumFindPetsByStatus?, queryDefaultInt: java.math.BigDecimal?, headerDefault: kotlin.String?, headerDefaultEnum: HeaderDefaultEnumFindPetsByStatus?, headerDefaultInt: java.math.BigDecimal?, cookieDefault: kotlin.String?, cookieDefaultEnum: CookieDefaultEnumFindPetsByStatus?, cookieDefaultInt: java.math.BigDecimal?, queryNullable: kotlin.String?, headerNullable: kotlin.String?, cookieNullable: kotlin.String?, dollarQueryDollarDollarSign: kotlin.String?) : RequestConfig<Unit> {
        val localVariableBody = null
        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
            .apply {
                if (queryDefault != null) {
                    put("query_default", listOf(queryDefault.toString()))
                }
+                if (queryDefaultEnum != null) {
+                    put("query_default_enum", listOf(queryDefaultEnum.value))
+                }
+                if (queryDefaultInt != null) {
+                    put("query_default_int", listOf(queryDefaultInt.toString()))
+                }
                if (queryNullable != null) {
                    put("query_nullable", listOf(queryNullable.toString()))
                }
@ -137,6 +188,8 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
            }
        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
        headerDefault?.apply { localVariableHeaders["header_default"] = this.toString() }
+        headerDefaultEnum?.apply { localVariableHeaders["header_default_enum"] = this.toString() }
+        headerDefaultInt?.apply { localVariableHeaders["header_default_int"] = this.toString() }
        headerNullable?.apply { localVariableHeaders["header_nullable"] = this.toString() }
        
        return RequestConfig(
--- a/samples/server/others/kotlin-server/jaxrs-spec/src/main/kotlin/org/openapitools/server/apis/DefaultApi.kt
+++ b/samples/server/others/kotlin-server/jaxrs-spec/src/main/kotlin/org/openapitools/server/apis/DefaultApi.kt
@ -14,7 +14,7 @@ import java.io.InputStream
 class DefaultApi {

    @GET
-    suspend fun findPetsByStatus(@PathParam("path_default") pathDefault: kotlin.String,@PathParam("path_nullable") pathNullable: kotlin.String,@QueryParam("query_default") @DefaultValue("available")   queryDefault: kotlin.String,@HeaderParam("header_default")  @DefaultValue("available")  headerDefault: kotlin.String,@CookieParam("cookie_default") @DefaultValue("available")  cookieDefault: kotlin.String,@QueryParam("query_nullable")   queryNullable: kotlin.String?,@HeaderParam("header_nullable")   headerNullable: kotlin.String?,@CookieParam("cookie_nullable")  cookieNullable: kotlin.String?,@QueryParam("\$query-\$dollar-sign")   dollarQueryDollarDollarSign: kotlin.String?): Response {
+    suspend fun findPetsByStatus(@PathParam("path_default") pathDefault: kotlin.String,@PathParam("path_nullable") pathNullable: kotlin.String,@QueryParam("query_default") @DefaultValue("available")   queryDefault: kotlin.String,@QueryParam("query_default_enum") @DefaultValue("B")   queryDefaultEnum: kotlin.String,@QueryParam("query_default_int") @DefaultValue("3")   queryDefaultInt: java.math.BigDecimal,@HeaderParam("header_default")  @DefaultValue("available")  headerDefault: kotlin.String,@HeaderParam("header_default_enum")  @DefaultValue("B")  headerDefaultEnum: kotlin.String,@HeaderParam("header_default_int")  @DefaultValue("3")  headerDefaultInt: java.math.BigDecimal,@CookieParam("cookie_default") @DefaultValue("available")  cookieDefault: kotlin.String,@CookieParam("cookie_default_enum") @DefaultValue("B")  cookieDefaultEnum: kotlin.String,@CookieParam("cookie_default_int") @DefaultValue("3")  cookieDefaultInt: java.math.BigDecimal,@QueryParam("query_nullable")   queryNullable: kotlin.String?,@HeaderParam("header_nullable")   headerNullable: kotlin.String?,@CookieParam("cookie_nullable")  cookieNullable: kotlin.String?,@QueryParam("\$query-\$dollar-sign")   dollarQueryDollarDollarSign: kotlin.String?): Response {
        return Response.ok().entity("magic!").build();
    }
 }