Merge branch 'master' into fix-defaultValue

Author: cgpoh

README.md

@@ -1139,7 +1139,7 @@ Here is a list of template creators:
    * Kotlin (Spring Boot): @dr4ke616
    * Kotlin (Vertx): @Wooyme
    * Kotlin (JAX-RS): @anttileppa
-   * Kotlin Misk: @andrewwilsonnew
+   * Kotlin Misk: @andrewwilsonnew @guiarn
    * Kotlin WireMock: @stefankoppier
    * NodeJS Express: @YishTish
    * PHP Flight: @daniel-sc

bin/configs/manual/rust-axum-array-params.yaml

@@ -0,0 +1,11 @@
+generatorName: rust-axum
+outputDir: samples/server/petstore/rust-axum/output/rust-axum-array-params-test
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-axum-array-params-test.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-axum
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-axum-array-params-test
+globalProperties:
+  skipFormModel: false
+enablePostProcessFile: true

bin/configs/typescript-echo-api.yaml

@@ -0,0 +1,10 @@
+generatorName: typescript
+outputDir: samples/client/echo_api/typescript/build
+inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript
+additionalProperties:
+  artifactId: echo-api-typescript
+  hideGenerationTimestamp: "true"
+  platform: node
+  npmVersion: 1.0.0
+  npmName: '@openapitools/typescript-echo-api'

docs/generators/scala-sttp.md

@@ -20,6 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|circeVersion|The version of circe library| |0.14.1|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (preferred for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|

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

@@ -454,29 +454,6 @@ public String escapeQuotationMark(String input) {
         return input.replace("\"", "\\\"");
     }
 
-    protected String escapeRegex(String pattern) {
-        pattern = pattern.replaceAll("\\\\\\\\", "\\\\");
-        pattern = pattern.replaceAll("^/", "");
-        pattern = pattern.replaceAll("/$", "");
-        return pattern;
-    }
-
-    /**
-     * Convert OpenAPI Parameter object to Codegen Parameter object
-     *
-     * @param imports set of imports for library/package/module
-     * @param param   OpenAPI parameter object
-     * @return Codegen Parameter object
-     */
-    @Override
-    public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
-        CodegenParameter parameter = super.fromParameter(param, imports);
-        if (parameter.pattern != null) {
-            parameter.pattern = escapeRegex(parameter.pattern);
-        }
-        return parameter;
-    }
-
     /**
      * Convert OAS Property schema to Codegen Property object.
      * <p>
@@ -498,9 +475,6 @@ public CodegenProperty fromProperty(String name, Schema schema, boolean required
         if (needsVarEscape(property.name)) {
             property.name = "var\"" + property.name + "\"";
         }
-        if (property.pattern != null) {
-            property.pattern = escapeRegex(property.pattern);
-        }
         return property;
     }
 
@@ -531,6 +505,19 @@ private void changeParamNames(List<CodegenParameter> paramsList, HashSet<String>
         }
     }
 
+    @Override
+    public String toRegularExpression(String pattern) {
+        if (pattern == null) {
+            return pattern;
+        }
+
+        pattern = escapeText(pattern);
+        // escapeText unnecessarily escapes `\` such that `\.` in the regex ends up as `\\.` for example.
+        // we need to restore it back by converting `\\` to `\`
+        pattern = pattern.replaceAll("\\\\\\\\", "\\\\");
+        return pattern;
+    }
+
     /**
      * Convert OAS Operation object to Codegen Operation object
      *

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

@@ -214,7 +214,7 @@ public String toDefaultValue(Schema p) {
                 String defaultValue = String.valueOf(p.getDefault());
                 if (defaultValue != null) {
                     defaultValue = defaultValue.replace("\\", "\\\\")
-                            .replace("'", "\'");
+                            .replace("'", "\\'");
                     if (Pattern.compile("\r\n|\r|\n").matcher(defaultValue).find()) {
                         return "'''" + defaultValue + "'''";
                     } else {

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

@@ -413,7 +413,9 @@ public void processOpts() {
             setParamNaming((String) additionalProperties.get(CodegenConstants.PARAM_NAMING));
         }
 
-        setSupportsES6(convertPropertyToBooleanAndWriteBack(CodegenConstants.SUPPORTS_ES6));
+        if (additionalProperties.containsKey(CodegenConstants.SUPPORTS_ES6)) {
+            setSupportsES6(convertPropertyToBooleanAndWriteBack(CodegenConstants.SUPPORTS_ES6));
+        }
 
         if (additionalProperties.containsKey(NULL_SAFE_ADDITIONAL_PROPS)) {
             setNullSafeAdditionalProps(Boolean.valueOf(additionalProperties.get(NULL_SAFE_ADDITIONAL_PROPS).toString()));

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

@@ -924,6 +924,7 @@ public void processOpts() {
                 addSupportingFiles(clientPackageDir, packageFolder, excludeTests, testPackageFolder, testPackageName, modelPackageDir, authPackageDir);
                 supportingFiles.add(new SupportingFile("ConnectionException.mustache", clientPackageDir, "ConnectionException.cs"));
                 supportingFiles.add(new SupportingFile("UnexpectedResponseException.mustache", clientPackageDir, "UnexpectedResponseException.cs"));
+                supportingFiles.add(new SupportingFile("UnityWebRequestAwaiterExtension.mustache", clientPackageDir, "UnityWebRequestAwaiterExtension.cs"));
                 break;
             default: // generichost
                 addGenericHostSupportingFiles(clientPackageDir, packageFolder, excludeTests, testPackageFolder, testPackageName, modelPackageDir);

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

@@ -57,11 +57,10 @@ public class ElixirClientCodegen extends DefaultCodegen {
     // This is the name of elixir project name;
     protected static final String defaultPackageName = "openapi_client";
 
-    String supportedElixirVersion = "1.10";
+    String supportedElixirVersion = "1.18";
     List<String> extraApplications = Arrays.asList(":logger");
     List<String> deps = Arrays.asList(
             "{:tesla, \"~> 1.7\"}",
-            "{:jason, \"~> 1.4\"}",
             "{:ex_doc, \"~> 0.30\", only: :dev, runtime: false}",
             "{:dialyxir, \"~> 1.3\", only: [:dev, :test], runtime: false}");
 
@@ -694,7 +693,7 @@ public String codeMappingKey() {
         }
 
         public String decodedStruct() {
-            // Let Jason decode the entire response into a generic blob
+            // Decode the entire response into a generic blob
             if (isMap) {
                 return "%{}";
             }

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

@@ -57,8 +57,7 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements Be
     protected String rootPackage = "org.openapitools.server.api";
     protected String apiVersion = "1.0.0-SNAPSHOT";
 
-    @Setter
-    protected String moduleClassName = "OpenApiModule";
+    @Setter protected String moduleClassName = "OpenApiModule";
 
     @Override
     public CodegenType getTag() {
@@ -122,7 +121,7 @@ public KotlinMiskServerCodegen() {
         supportingFiles.clear();
 
         apiTemplateFiles.clear();
-        apiTemplateFiles.put("apiController.mustache", "Controller.kt");
+        apiTemplateFiles.put("apiAction.mustache", "Action.kt");
         apiTemplateFiles.put("apiImpl.mustache", "Impl.kt");
         apiTemplateFiles.put("apiInterface.mustache", ".kt");
         modelTemplateFiles.put("model.mustache", ".kt");
@@ -199,30 +198,38 @@ public boolean getUseBeanValidation() {
     }
 
     private String mapMediaType(String mediaType) {
-        return MEDIA_MAPPING.getOrDefault(mediaType, "MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> " + mediaType + " */ ");
+        return MEDIA_MAPPING.getOrDefault(mediaType, "MediaTypes.APPLICATION_OCTETSTREAM /* @todo(unknown) -> " + mediaType + " */ ");
     }
 
     private final static Map<String, String> MEDIA_MAPPING = getMappings();
 
     private static Map<String, String> getMappings() {
+        // add new values in order
         Map<String, String> result = new HashMap<>();
-        result.put("application/json", "MediaTypes.APPLICATION_JSON");
-        result.put("application/xml", "MediaTypes.APPLICATION_XML");
-        result.put("application/javascript", "MediaTypes.APPLICATION_JAVASCRIPT");
         result.put("*/*", "MediaTypes.ALL");
-        result.put("application/x-www-form-urlencoded", "MediaTypes.APPLICATION_FORM_URLENCODED");
+
+        result.put("application/grpc", "MediaTypes.APPLICATION_GRPC");
+        result.put("application/javascript", "MediaTypes.APPLICATION_JAVASCRIPT");
+        result.put("application/json", "MediaTypes.APPLICATION_JSON");
         result.put("application/octetstream", "MediaTypes.APPLICATION_OCTETSTREAM");
         result.put("application/pdf", "MediaTypes.APPLICATION_OCTETSTREAM");
         result.put("application/x-protobuf", "MediaTypes.APPLICATION_PROTOBUF");
-        result.put("application/grpc", "MediaTypes.APPLICATION_GRPC");
-        result.put("text/css", "MediaTypes.TEXT_CSS");
-        result.put("text/html", "MediaTypes.TEXT_HTML");
-        result.put("text/plain", "MediaTypes.TEXT_PLAIN_UTF8");
+        result.put("application/x-www-form-urlencoded", "MediaTypes.APPLICATION_FORM_URLENCODED");
+        result.put("application/xml", "MediaTypes.APPLICATION_XML");
+        result.put("application/zip", "MediaTypes.APPLICATION_ZIP");
+
+        result.put("image/gif", "MediaTypes.IMAGE_GIF");
+        result.put("image/jpeg", "MediaTypes.IMAGE_JPEG");
         result.put("image/png", "MediaTypes.IMAGE_PNG");
         result.put("image/svg+xml", "MediaTypes.IMAGE_SVG");
-        result.put("image/jpeg", "MediaTypes.IMAGE_JPEG");
-        result.put("image/gif", "MediaTypes.IMAGE_GIF");
         result.put("image/x-icon", "MediaTypes.IMAGE_ICO");
+
+        result.put("multipart/form-data", "MediaTypes.FORM_DATA");
+
+        result.put("text/css", "MediaTypes.TEXT_CSS");
+        result.put("text/html", "MediaTypes.TEXT_HTML");
+        result.put("text/plain", "MediaTypes.TEXT_PLAIN_UTF8");
+
         return result;
     }
 }