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

.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

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -449,6 +449,7 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .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))

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 + "\"");
+        }
+    }
+}

modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/ForwardSlashLambda.java

@@ -34,7 +34,7 @@
  *
  * Use:
  * <pre>
- * {{#fforwardslash}}{{summary}}{{/forwardslash}}
+ * {{#forwardslash}}{{summary}}{{/forwardslash}}
  * </pre>
  */
 public class ForwardSlashLambda implements Mustache.Lambda {

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}}

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}}

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}}

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

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]