Merge branch 'OpenAPITools:master' into master

Author: Knuf

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

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

modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ApiClient.mustache

@@ -377,10 +377,18 @@ namespace {{packageName}}.Client
 
             using (request)
             {
+                {{#useIntForTimeout}}
                 if (configuration.Timeout > 0)
                 {
-                    request.timeout = (int)Math.Ceiling(configuration.Timeout / 1000.0f);
+                    request.timeout = configuration.Timeout;
                 }
+                {{/useIntForTimeout}}
+                {{^useIntForTimeout}}
+                if (configuration.Timeout > TimeSpan.Zero)
+                {
+                    request.timeout = (int)Math.Ceiling(configuration.Timeout.TotalSeconds);
+                }
+                {{/useIntForTimeout}}
 
                 if (configuration.Proxy != null)
                 {
@@ -400,21 +408,34 @@ namespace {{packageName}}.Client
 
                 InterceptRequest(request, path, options, configuration);
 
+        #if UNITY_2020_2_OR_NEWER
+                // For Unity 2020.2 and newer, use UnityWebRequest.Result.
                 var asyncOp = request.SendWebRequest();
-
-                TaskCompletionSource<UnityWebRequest.Result> tsc = new TaskCompletionSource<UnityWebRequest.Result>();
-                asyncOp.completed += (_) => tsc.TrySetResult(request.result);
-
+                TaskCompletionSource<UnityWebRequest.Result> tcs = new TaskCompletionSource<UnityWebRequest.Result>();
+                asyncOp.completed += (_) => tcs.TrySetResult(request.result);
                 using (var tokenRegistration = cancellationToken.Register(request.Abort, true))
                 {
-                    await tsc.Task;
+                    await tcs.Task;
                 }
-                
+
                 if (request.result == UnityWebRequest.Result.ConnectionError ||
                     request.result == UnityWebRequest.Result.DataProcessingError)
                 {
                     throw new ConnectionException(request);
                 }
+        #else
+                // For Unity 2019 and earlier, await the operation directly.
+                var asyncOp = request.SendWebRequest();
+                using (var tokenRegistration = cancellationToken.Register(request.Abort, true))
+                {
+                    await asyncOp;
+                }
+
+                if (request.isNetworkError || request.isHttpError)
+                {
+                    throw new ConnectionException(request);
+                }
+        #endif
 
                 object responseData = deserializer.Deserialize<T>(request);
 
@@ -636,4 +657,4 @@ namespace {{packageName}}.Client
         }
         #endregion ISynchronousClient
     }
-}
+}

modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ConnectionException.mustache

@@ -5,6 +5,7 @@ using UnityEngine.Networking;
 
 namespace {{packageName}}.Client
 {
+#if UNITY_2020_1_OR_NEWER
     public class ConnectionException : Exception
     {
         public UnityWebRequest.Result Result { get; private set; }
@@ -18,4 +19,39 @@ namespace {{packageName}}.Client
             Error = request.error ?? "";
         }
     }
+#else
+    // For Unity 2019, define a custom enum that roughly simulates UnityWebRequest.Result.
+    public enum UnityWebRequestResultLegacy
+    {
+        Success,
+        ConnectionError,
+        ProtocolError,
+        DataProcessingError
+    }
+
+    public class ConnectionException : Exception
+    {
+        public UnityWebRequestResultLegacy Result { get; private set; }
+        public string Error { get; private set; }
+
+        public ConnectionException(UnityWebRequest request)
+            : base($"Error: {request.error}")
+        {
+            if (request.isNetworkError)
+            {
+                Result = UnityWebRequestResultLegacy.ConnectionError;
+            }
+            else if (request.isHttpError)
+            {
+                Result = UnityWebRequestResultLegacy.ProtocolError;
+            }
+            else
+            {
+                Result = UnityWebRequestResultLegacy.Success;
+            }
+
+            Error = request.error ?? "";
+        }
+    }
+#endif
 }

modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/README.mustache

@@ -20,7 +20,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 <a id="version-support"></a>
 ## Version support
 This generator should support all current LTS versions of Unity
-- Unity 2020.3 (LTS) and up
+- Unity 2019.4 (LTS) and up
 - .NET Standard 2.1 / .NET Framework
 
 <a id="dependencies"></a>

modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/UnityWebRequestAwaiterExtension.mustache

@@ -0,0 +1,23 @@
+{{>partial_header}}
+
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using UnityEngine.Networking;
+
+namespace {{packageName}}.Client
+{
+    /// <summary>
+    /// Provides an awaiter for UnityWebRequestAsyncOperation to allow `await request.SendWebRequest()`
+    /// in Unity async methods. Unity's AsyncOperation types are not awaitable by default, so this
+    /// extension bridges that gap by converting the operation into a Task.
+    /// </summary>
+    public static class UnityWebRequestAwaiterExtensions
+    {
+        public static TaskAwaiter<UnityWebRequestAsyncOperation> GetAwaiter(this UnityWebRequestAsyncOperation asyncOp)
+        {
+            var tcs = new TaskCompletionSource<UnityWebRequestAsyncOperation>();
+            asyncOp.completed += _ => tcs.SetResult(asyncOp);
+            return tcs.Task.GetAwaiter();
+        }
+    }
+}

modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache renamed to modules/openapi-generator/src/main/resources/kotlin-misk/apiAction.mustache

@@ -34,10 +34,10 @@ import misk.web.mediatype.MediaTypes
 
 {{#operations}}
 /**
- * Generated file, please change {{classname}}Controller.
+ * Generated file, please change {{classname}}Impl.
  */
 @Singleton
-class {{classname}}Controller @Inject constructor(
+class {{classname}}Action @Inject constructor(
     private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}}
 ) : WebAction, {{classname}} {
 {{#operation}}

modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache

@@ -21,7 +21,7 @@ internal class {{classname}}Test {
     {{#operations}}
     {{#operation}}
     /**
-     * To test {{classname}}Controller.{{operationId}}
+     * To test {{classname}}Action.{{operationId}}
      */
     @Test
     fun `should handle {{operationId}}`() {

modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache

@@ -9,7 +9,7 @@ version = "{{artifactVersion}}"
 
 dependencies {
     implementation("jakarta.validation:jakarta.validation-api:3.1.1")
-    implementation("com.squareup.misk:misk:2025.03.17.160337-2c6953c")
+    implementation("com.squareup.misk:misk:2025.04.02.195630-a61d550")
     //implementation("com.squareup.wire:wire-runtime:5.2.1")
 
     testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324")

modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache

@@ -6,7 +6,7 @@ import {{javaxPackage}}.inject.Singleton
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
-import {{apiPackage}}.{{classname}}Controller
+import {{apiPackage}}.{{classname}}Action
 {{/operations}}
 {{/apis}}
 {{/apiInfo}}
@@ -17,7 +17,7 @@ class {{moduleClassName}} : KAbstractModule() {
         {{#apiInfo}}
         {{#apis}}
         {{#operations}}
-        install(WebActionModule.create<{{classname}}Controller>())
+        install(WebActionModule.create<{{classname}}Action>())
         {{/operations}}
         {{/apis}}
         {{/apiInfo}}

modules/openapi-generator/src/main/resources/php-laravel/api_controller.mustache

@@ -91,6 +91,7 @@ class {{controllerName}} extends Controller
             $apiResult = $this->api->{{operationId}}({{#allParams}}${{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
         } catch (\Exception $exception) {
             // This shouldn't happen
+            report($exception);
             return response()->json(['error' => $exception->getMessage()], 500);
         }