Merge branch 'master' into cashapp/protos

Author: Andrew Wilson

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/protobuf-schema-config.yaml

@@ -8,6 +8,7 @@ additionalProperties:
   numberedFieldNumberList: true
   startEnumsWithUnspecified: true
   wrapComplexType: false
+  supportMultipleResponses: false
   aggregateModelsName: data
 typeMappings:
   object: "google.protobuf.Struct"

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/protobuf-schema.md

@@ -22,6 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |aggregateModelsName|Aggregated model filename. If set, all generated models will be combined into this single file.| |null|
 |numberedFieldNumberList|Field numbers in order.| |false|
 |startEnumsWithUnspecified|Introduces "UNSPECIFIED" as the first element of enumerations.| |false|
+|supportMultipleResponses|Support multiple responses| |true|
 |wrapComplexType|Generate Additional message for complex type| |true|
 
 ## IMPORT MAPPING

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 "%{}";
             }