From 078f06812be11e5ef0ba0001478e4bbf4d47515c Mon Sep 17 00:00:00 2001
From: devhl <shawnkanyer@gmail.com>
Date: Sun, 16 Jun 2024 16:14:01 -0400
Subject: [PATCH 1/4] change sorting default

---
 .../codegen/languages/CSharpClientCodegen.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 8a30d47575fe..fd12c4fffbbc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -125,8 +125,8 @@ enum SortingMethod {
         ALPHABETICAL,
         LEGACY
     }
-    private SortingMethod operationParameterSorting = SortingMethod.LEGACY;
-    private SortingMethod modelPropertySorting = SortingMethod.LEGACY;
+    private SortingMethod operationParameterSorting = SortingMethod.DEFAULT;
+    private SortingMethod modelPropertySorting = SortingMethod.DEFAULT;
 
     protected boolean caseInsensitiveResponseHeaders = Boolean.FALSE;
     protected String releaseNote = "Minor update";
@@ -229,11 +229,11 @@ public CSharpClientCodegen() {
                 null);
 
         addOption(CSharpClientCodegen.OPERATION_PARAMETER_SORTING_KEY,
-                "One of legacy, alphabetical, default (only `generichost` library supports this option).",
+                "One of legacy, alphabetical, default.",
                 this.operationParameterSorting.toString().toLowerCase(Locale.ROOT));
 
         addOption(CSharpClientCodegen.MODEL_PROPERTY_SORTING_KEY,
-                "One of legacy, alphabetical, default (only `generichost` library supports this option).",
+                "One of legacy, alphabetical, default.",
                 this.modelPropertySorting.toString().toLowerCase(Locale.ROOT));
 
         CliOption framework = new CliOption(
@@ -468,6 +468,8 @@ public CodegenModel fromModel(String name, Schema model) {
             }
         }
 
+        // TODO: remove the library check by adding alphabetical and default options for other libraries
+
         // avoid breaking changes
         if (GENERICHOST.equals(getLibrary()) && codegenModel != null) {
 
@@ -926,6 +928,8 @@ public CodegenOperation fromOperation(String path,
                                           List<Server> servers) {
         CodegenOperation op = super.fromOperation(path, httpMethod, operation, servers);
 
+        // TODO: remove the library check by adding alphabetical and default options for other libraries
+
         if (!GENERICHOST.equals(getLibrary())) {
             return op;
         }

From 3f9a193ba1e895b21ae89dcded549a5634a1b94f Mon Sep 17 00:00:00 2001
From: devhl <shawnkanyer@gmail.com>
Date: Sun, 14 Jul 2024 16:47:44 -0400
Subject: [PATCH 2/4] implement sorting options for all libraries

---
 docs/generators/csharp.md                     |   4 +-
 .../openapitools/codegen/DefaultCodegen.java  |  50 ++-
 .../languages/CSharpClientCodegen.java        | 157 ++++----
 .../net4.7/AllOf/docs/models/Adult.md         |   4 +-
 .../net4.7/AllOf/docs/models/Child.md         |   6 +-
 .../net4.7/AllOf/docs/models/Person.md        |   4 +-
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs |  81 ++--
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs |  76 ++--
 .../src/Org.OpenAPITools/Model/Person.cs      |  62 +--
 .../net4.7/FormModels/docs/apis/FakeApi.md    |  68 ++--
 .../net4.7/FormModels/docs/apis/PetApi.md     |  20 +-
 .../net4.7/FormModels/docs/apis/UserApi.md    |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 360 ++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../net4.7/Petstore/docs/apis/FakeApi.md      |  68 ++--
 .../net4.7/Petstore/docs/apis/PetApi.md       |  20 +-
 .../net4.7/Petstore/docs/apis/UserApi.md      |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../net4.8/AllOf/docs/models/Adult.md         |   4 +-
 .../net4.8/AllOf/docs/models/Child.md         |   6 +-
 .../net4.8/AllOf/docs/models/Person.md        |   4 +-
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs |  81 ++--
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs |  76 ++--
 .../src/Org.OpenAPITools/Model/Person.cs      |  62 +--
 .../net4.8/FormModels/docs/apis/FakeApi.md    |  68 ++--
 .../net4.8/FormModels/docs/apis/PetApi.md     |  20 +-
 .../net4.8/FormModels/docs/apis/UserApi.md    |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 360 ++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../net4.8/Petstore/docs/apis/FakeApi.md      |  68 ++--
 .../net4.8/Petstore/docs/apis/PetApi.md       |  20 +-
 .../net4.8/Petstore/docs/apis/UserApi.md      |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../net8/AllOf/docs/models/Adult.md           |   4 +-
 .../net8/AllOf/docs/models/Child.md           |   6 +-
 .../net8/AllOf/docs/models/Person.md          |   4 +-
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs |  81 ++--
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs |  76 ++--
 .../src/Org.OpenAPITools/Model/Person.cs      |  62 +--
 .../net8/FormModels/docs/apis/FakeApi.md      |  68 ++--
 .../net8/FormModels/docs/apis/PetApi.md       |  20 +-
 .../net8/FormModels/docs/apis/UserApi.md      |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 360 ++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../NullReferenceTypes/docs/apis/FakeApi.md   |  68 ++--
 .../NullReferenceTypes/docs/apis/PetApi.md    |  20 +-
 .../NullReferenceTypes/docs/apis/UserApi.md   |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../net8/Petstore/docs/apis/FakeApi.md        |  68 ++--
 .../net8/Petstore/docs/apis/PetApi.md         |  20 +-
 .../net8/Petstore/docs/apis/UserApi.md        |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../SourceGeneration/docs/apis/FakeApi.md     |  68 ++--
 .../net8/SourceGeneration/docs/apis/PetApi.md |  20 +-
 .../SourceGeneration/docs/apis/UserApi.md     |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 .../standard2.0/Petstore/docs/apis/FakeApi.md |  68 ++--
 .../standard2.0/Petstore/docs/apis/PetApi.md  |  20 +-
 .../standard2.0/Petstore/docs/apis/UserApi.md |  10 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 380 +++++++++---------
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 112 +++---
 .../src/Org.OpenAPITools/Api/UserApi.cs       |  58 +--
 75 files changed, 3346 insertions(+), 3336 deletions(-)

diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md
index 8e6cd6abb7d6..da8868f93841 100644
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@@ -31,11 +31,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |library|HTTP library template (sub-template) to use|<dl><dt>**generichost**</dt><dd>HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)</dd><dt>**httpclient**</dt><dd>HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)</dd><dt>**unityWebRequest**</dt><dd>UnityWebRequest (...) (Experimental. Subject to breaking changes without notice.)</dd><dt>**restsharp**</dt><dd>RestSharp (https://github.com/restsharp/RestSharp)</dd></dl>|restsharp|
 |licenseId|The identifier of the license| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
-|modelPropertySorting|One of legacy, alphabetical, default (only `generichost` library supports this option).| |legacy|
+|modelPropertySorting|One of legacy, alphabetical, default.| |default|
 |netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
 |nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
 |nullableReferenceTypes|Use nullable annotations in the project. Only supported on C# 8 / ASP.NET Core 3.1 or newer. Starting in .NET 6.0 the default is true.| |false|
-|operationParameterSorting|One of legacy, alphabetical, default (only `generichost` library supports this option).| |legacy|
+|operationParameterSorting|One of legacy, alphabetical, default.| |default|
 |optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
 |optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
 |optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 901696e19180..186249054c94 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -3092,16 +3092,7 @@ public CodegenModel fromModel(String name, Schema schema) {
         }
 
         if (sortModelPropertiesByRequiredFlag) {
-            Comparator<CodegenProperty> comparator = new Comparator<CodegenProperty>() {
-                @Override
-                public int compare(CodegenProperty one, CodegenProperty another) {
-                    if (one.required == another.required) return 0;
-                    else if (one.required) return -1;
-                    else return 1;
-                }
-            };
-            Collections.sort(m.vars, comparator);
-            Collections.sort(m.allVars, comparator);
+            SortModelPropertiesByRequiredFlag(m);
         }
 
         // post process model properties
@@ -3120,6 +3111,19 @@ public int compare(CodegenProperty one, CodegenProperty another) {
         return m;
     }
 
+    protected void SortModelPropertiesByRequiredFlag(CodegenModel model) {
+        Comparator<CodegenProperty> comparator = new Comparator<CodegenProperty>() {
+            @Override
+            public int compare(CodegenProperty one, CodegenProperty another) {
+                if (one.required == another.required) return 0;
+                else if (one.required) return -1;
+                else return 1;
+            }
+        };
+        Collections.sort(model.vars, comparator);
+        Collections.sort(model.allVars, comparator);
+    }
+
     protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property) {
         if (schema.equals(new Schema())) {
             // if we are trying to set additionalProperties on an empty schema stop recursing
@@ -4729,17 +4733,7 @@ public CodegenOperation fromOperation(String path,
 
         // move "required" parameters in front of "optional" parameters
         if (sortParamsByRequiredFlag) {
-            Collections.sort(allParams, new Comparator<CodegenParameter>() {
-                @Override
-                public int compare(CodegenParameter one, CodegenParameter another) {
-                    if (one.required == another.required)
-                        return 0;
-                    else if (one.required)
-                        return -1;
-                    else
-                        return 1;
-                }
-            });
+            SortParametersByRequiredFlag(allParams);
         }
 
         op.allParams = allParams;
@@ -4773,6 +4767,20 @@ else if (one.required)
         return op;
     }
 
+    public void SortParametersByRequiredFlag(List<CodegenParameter> parameters) {
+        Collections.sort(parameters, new Comparator<CodegenParameter>() {
+            @Override
+            public int compare(CodegenParameter one, CodegenParameter another) {
+                if (one.required == another.required)
+                    return 0;
+                else if (one.required)
+                    return -1;
+                else
+                    return 1;
+            }
+        });
+    }
+
     public boolean isParameterNameUnique(CodegenParameter p, List<CodegenParameter> parameters) {
         for (CodegenParameter parameter : parameters) {
             if (System.identityHashCode(p) == System.identityHashCode(parameter)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index fd12c4fffbbc..15ff7fd96f7a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -468,12 +468,8 @@ public CodegenModel fromModel(String name, Schema model) {
             }
         }
 
-        // TODO: remove the library check by adding alphabetical and default options for other libraries
-
-        // avoid breaking changes
-        if (GENERICHOST.equals(getLibrary()) && codegenModel != null) {
-
-            if (this.modelPropertySorting == SortingMethod.LEGACY) {
+        if (codegenModel != null) {
+            if (this.modelPropertySorting == SortingMethod.ALPHABETICAL) {
                 Collections.sort(codegenModel.vars, propertyComparatorByName);
                 Collections.sort(codegenModel.allVars, propertyComparatorByName);
                 Collections.sort(codegenModel.requiredVars, propertyComparatorByName);
@@ -481,17 +477,11 @@ public CodegenModel fromModel(String name, Schema model) {
                 Collections.sort(codegenModel.readOnlyVars, propertyComparatorByName);
                 Collections.sort(codegenModel.readWriteVars, propertyComparatorByName);
                 Collections.sort(codegenModel.parentVars, propertyComparatorByName);
-
-                Collections.sort(codegenModel.vars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.allVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.requiredVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.optionalVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.readOnlyVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.readWriteVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
-                Collections.sort(codegenModel.parentVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
             }
-            else {
-                if (this.modelPropertySorting == SortingMethod.ALPHABETICAL) {
+
+            if (GENERICHOST.equals(getLibrary())) {
+
+                if (this.modelPropertySorting == SortingMethod.LEGACY) {
                     Collections.sort(codegenModel.vars, propertyComparatorByName);
                     Collections.sort(codegenModel.allVars, propertyComparatorByName);
                     Collections.sort(codegenModel.requiredVars, propertyComparatorByName);
@@ -499,16 +489,27 @@ public CodegenModel fromModel(String name, Schema model) {
                     Collections.sort(codegenModel.readOnlyVars, propertyComparatorByName);
                     Collections.sort(codegenModel.readWriteVars, propertyComparatorByName);
                     Collections.sort(codegenModel.parentVars, propertyComparatorByName);
-                }
 
-                Collections.sort(codegenModel.vars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.allVars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.requiredVars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.optionalVars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.readOnlyVars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.readWriteVars, propertyComparatorByNotNullableRequiredNoDefault);
-                Collections.sort(codegenModel.parentVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.vars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.allVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.requiredVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.optionalVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.readOnlyVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.readWriteVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                    Collections.sort(codegenModel.parentVars, propertyComparatorByNotNullableRequiredNoDefaultLegacy);
+                }
+                else {
+                    Collections.sort(codegenModel.vars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.allVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.requiredVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.optionalVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.readOnlyVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.readWriteVars, propertyComparatorByNotNullableRequiredNoDefault);
+                    Collections.sort(codegenModel.parentVars, propertyComparatorByNotNullableRequiredNoDefault);
+                }
             }
+        } else {
+            SortModelPropertiesByRequiredFlag(codegenModel);
         }
 
         return codegenModel;
@@ -928,63 +929,61 @@ public CodegenOperation fromOperation(String path,
                                           List<Server> servers) {
         CodegenOperation op = super.fromOperation(path, httpMethod, operation, servers);
 
-        // TODO: remove the library check by adding alphabetical and default options for other libraries
+        if (this.operationParameterSorting == SortingMethod.ALPHABETICAL) {
+            Collections.sort(op.allParams, parameterComparatorByName);
+            Collections.sort(op.bodyParams, parameterComparatorByName);
+            Collections.sort(op.pathParams, parameterComparatorByName);
+            Collections.sort(op.queryParams, parameterComparatorByName);
+            Collections.sort(op.headerParams, parameterComparatorByName);
+            Collections.sort(op.implicitHeadersParams, parameterComparatorByName);
+            Collections.sort(op.formParams, parameterComparatorByName);
+            Collections.sort(op.cookieParams, parameterComparatorByName);
+            Collections.sort(op.requiredParams, parameterComparatorByName);
+            Collections.sort(op.optionalParams, parameterComparatorByName);
+            Collections.sort(op.notNullableParams, parameterComparatorByName);
+        }
 
-        if (!GENERICHOST.equals(getLibrary())) {
-            return op;
-        }
-
-        if (this.operationParameterSorting == SortingMethod.LEGACY) {
-            Collections.sort(op.allParams, parameterComparatorByDataType);
-            Collections.sort(op.bodyParams, parameterComparatorByDataType);
-            Collections.sort(op.pathParams, parameterComparatorByDataType);
-            Collections.sort(op.queryParams, parameterComparatorByDataType);
-            Collections.sort(op.headerParams, parameterComparatorByDataType);
-            Collections.sort(op.implicitHeadersParams, parameterComparatorByDataType);
-            Collections.sort(op.formParams, parameterComparatorByDataType);
-            Collections.sort(op.cookieParams, parameterComparatorByDataType);
-            Collections.sort(op.requiredParams, parameterComparatorByDataType);
-            Collections.sort(op.optionalParams, parameterComparatorByDataType);
-            Collections.sort(op.notNullableParams, parameterComparatorByDataType);
-
-            Comparator<CodegenParameter> comparator = parameterComparatorByRequired.thenComparing(parameterComparatorByDefaultValue);
-            Collections.sort(op.allParams, comparator);
-            Collections.sort(op.bodyParams, comparator);
-            Collections.sort(op.pathParams, comparator);
-            Collections.sort(op.queryParams, comparator);
-            Collections.sort(op.headerParams, comparator);
-            Collections.sort(op.implicitHeadersParams, comparator);
-            Collections.sort(op.formParams, comparator);
-            Collections.sort(op.cookieParams, comparator);
-            Collections.sort(op.requiredParams, comparator);
-            Collections.sort(op.optionalParams, comparator);
-            Collections.sort(op.notNullableParams, comparator);
-        } else {
-            if (this.operationParameterSorting == SortingMethod.ALPHABETICAL) {
-                Collections.sort(op.allParams, parameterComparatorByName);
-                Collections.sort(op.bodyParams, parameterComparatorByName);
-                Collections.sort(op.pathParams, parameterComparatorByName);
-                Collections.sort(op.queryParams, parameterComparatorByName);
-                Collections.sort(op.headerParams, parameterComparatorByName);
-                Collections.sort(op.implicitHeadersParams, parameterComparatorByName);
-                Collections.sort(op.formParams, parameterComparatorByName);
-                Collections.sort(op.cookieParams, parameterComparatorByName);
-                Collections.sort(op.requiredParams, parameterComparatorByName);
-                Collections.sort(op.optionalParams, parameterComparatorByName);
-                Collections.sort(op.notNullableParams, parameterComparatorByName);
+        if (GENERICHOST.equals(getLibrary())) {
+            if (this.operationParameterSorting == SortingMethod.LEGACY) {
+                Collections.sort(op.allParams, parameterComparatorByDataType);
+                Collections.sort(op.bodyParams, parameterComparatorByDataType);
+                Collections.sort(op.pathParams, parameterComparatorByDataType);
+                Collections.sort(op.queryParams, parameterComparatorByDataType);
+                Collections.sort(op.headerParams, parameterComparatorByDataType);
+                Collections.sort(op.implicitHeadersParams, parameterComparatorByDataType);
+                Collections.sort(op.formParams, parameterComparatorByDataType);
+                Collections.sort(op.cookieParams, parameterComparatorByDataType);
+                Collections.sort(op.requiredParams, parameterComparatorByDataType);
+                Collections.sort(op.optionalParams, parameterComparatorByDataType);
+                Collections.sort(op.notNullableParams, parameterComparatorByDataType);
+
+                Comparator<CodegenParameter> comparator = parameterComparatorByRequired.thenComparing(parameterComparatorByDefaultValue);
+                Collections.sort(op.allParams, comparator);
+                Collections.sort(op.bodyParams, comparator);
+                Collections.sort(op.pathParams, comparator);
+                Collections.sort(op.queryParams, comparator);
+                Collections.sort(op.headerParams, comparator);
+                Collections.sort(op.implicitHeadersParams, comparator);
+                Collections.sort(op.formParams, comparator);
+                Collections.sort(op.cookieParams, comparator);
+                Collections.sort(op.requiredParams, comparator);
+                Collections.sort(op.optionalParams, comparator);
+                Collections.sort(op.notNullableParams, comparator);
+            } else {
+                Collections.sort(op.allParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.bodyParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.pathParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.queryParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.headerParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.implicitHeadersParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.formParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.cookieParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.requiredParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.optionalParams, parameterComparatorByNotNullableRequiredNoDefault);
+                Collections.sort(op.notNullableParams, parameterComparatorByNotNullableRequiredNoDefault);
             }
-
-            Collections.sort(op.allParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.bodyParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.pathParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.queryParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.headerParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.implicitHeadersParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.formParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.cookieParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.requiredParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.optionalParams, parameterComparatorByNotNullableRequiredNoDefault);
-            Collections.sort(op.notNullableParams, parameterComparatorByNotNullableRequiredNoDefault);
+        } else {
+            SortParametersByRequiredFlag(op.allParams);
         }
 
         return op;
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Adult.md b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Adult.md
index 4bf74e4efc9b..61a97ca2192b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Adult.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Adult.md
@@ -5,9 +5,9 @@ A representation of an adult
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **Children** | [**List&lt;Child&gt;**](Child.md) |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Child.md b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Child.md
index bb2a1e5a5613..9ac30fd2d619 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Child.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Child.md
@@ -5,11 +5,11 @@ A representation of a child
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
-**Age** | **int** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **BoosterSeat** | **bool** |  | [optional] 
+**Age** | **int** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Person.md b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Person.md
index 42c19689f9a1..b41b51f12f2a 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Person.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/docs/models/Person.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 7806add08bde..d03f2d88895c 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -32,11 +32,11 @@ public partial class Adult : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Adult" /> class.
         /// </summary>
-        /// <param name="children">children</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="children">children</param>
         [JsonConstructor]
-        public Adult(Option<List<Child>> children = default, Option<string> firstName = default, Option<string> lastName = default) : base(firstName, lastName)
+        public Adult(Option<string> lastName = default, Option<string> firstName = default, Option<List<Child>> children = default) : base(lastName, firstName)
         {
             ChildrenOption = children;
             OnCreated();
@@ -44,6 +44,13 @@ public Adult(Option<List<Child>> children = default, Option<string> firstName =
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Adult";
+
         /// <summary>
         /// Used to track the state of Children
         /// </summary>
@@ -57,13 +64,6 @@ public Adult(Option<List<Child>> children = default, Option<string> firstName =
         [JsonPropertyName("children")]
         public List<Child> Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new Option<List<Child>>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -101,10 +101,10 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<List<Child>> children = default;
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
+            Option<List<Child>> children = default;
 
             while (utf8JsonReader.Read())
             {
@@ -121,18 +121,18 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "children":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                children = new Option<List<Child>>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions));
-                            break;
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
+                            break;
+                        case "children":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                children = new Option<List<Child>>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;
@@ -140,19 +140,19 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (children.IsSet && children.Value == null)
-                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Adult.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+
+            if (children.IsSet && children.Value == null)
+                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
 
-            return new Adult(children, firstName, lastName);
+            return new Adult(lastName, firstName, children);
         }
 
         /// <summary>
@@ -179,27 +179,28 @@ public override void Write(Utf8JsonWriter writer, Adult adult, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Adult adult, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (adult.ChildrenOption.IsSet && adult.Children == null)
-                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+            if (adult.LastNameOption.IsSet && adult.LastName == null)
+                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
 
             if (adult.FirstNameOption.IsSet && adult.FirstName == null)
                 throw new ArgumentNullException(nameof(adult.FirstName), "Property is required for class Adult.");
 
-            if (adult.LastNameOption.IsSet && adult.LastName == null)
-                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
+            if (adult.ChildrenOption.IsSet && adult.Children == null)
+                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+
+            writer.WriteString("$_type", adult.Type);
+
+            if (adult.LastNameOption.IsSet)
+                writer.WriteString("lastName", adult.LastName);
+
+            if (adult.FirstNameOption.IsSet)
+                writer.WriteString("firstName", adult.FirstName);
 
             if (adult.ChildrenOption.IsSet)
             {
                 writer.WritePropertyName("children");
                 JsonSerializer.Serialize(writer, adult.Children, jsonSerializerOptions);
             }
-            if (adult.FirstNameOption.IsSet)
-                writer.WriteString("firstName", adult.FirstName);
-
-            if (adult.LastNameOption.IsSet)
-                writer.WriteString("lastName", adult.LastName);
-
-            writer.WriteString("$_type", adult.Type);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 35adb6d48805..6d3836752c61 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -32,12 +32,12 @@ public partial class Child : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Child" /> class.
         /// </summary>
-        /// <param name="age">age</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="age">age</param>
         /// <param name="boosterSeat">boosterSeat</param>
         [JsonConstructor]
-        public Child(Option<int?> age = default, Option<string> firstName = default, Option<string> lastName = default, Option<bool?> boosterSeat = default) : base(firstName, lastName)
+        public Child(Option<string> lastName = default, Option<string> firstName = default, Option<int?> age = default, Option<bool?> boosterSeat = default) : base(lastName, firstName)
         {
             AgeOption = age;
             BoosterSeatOption = boosterSeat;
@@ -46,6 +46,13 @@ public Child(Option<int?> age = default, Option<string> firstName = default, Opt
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Child";
+
         /// <summary>
         /// Used to track the state of Age
         /// </summary>
@@ -59,13 +66,6 @@ public Child(Option<int?> age = default, Option<string> firstName = default, Opt
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new Option<int?>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
@@ -88,8 +88,8 @@ public override string ToString()
             StringBuilder sb = new StringBuilder();
             sb.Append("class Child {\n");
             sb.Append("  ").Append(base.ToString()?.Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("  BoosterSeat: ").Append(BoosterSeat).Append("\n");
+            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -117,10 +117,10 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<int?> age = default;
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
+            Option<int?> age = default;
             Option<bool?> boosterSeat = default;
 
             while (utf8JsonReader.Read())
@@ -138,18 +138,18 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "age":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                age = new Option<int?>(utf8JsonReader.GetInt32());
-                            break;
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
+                            break;
+                        case "age":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                age = new Option<int?>(utf8JsonReader.GetInt32());
                             break;
                         case "boosterSeat":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -161,22 +161,22 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (age.IsSet && age.Value == null)
-                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Child.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+
+            if (age.IsSet && age.Value == null)
+                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
 
             if (boosterSeat.IsSet && boosterSeat.Value == null)
                 throw new ArgumentNullException(nameof(boosterSeat), "Property is not nullable for class Child.");
 
-            return new Child(age, firstName, lastName, boosterSeat);
+            return new Child(lastName, firstName, age, boosterSeat);
         }
 
         /// <summary>
@@ -203,22 +203,22 @@ public override void Write(Utf8JsonWriter writer, Child child, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Child child, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (child.FirstNameOption.IsSet && child.FirstName == null)
-                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
-
             if (child.LastNameOption.IsSet && child.LastName == null)
                 throw new ArgumentNullException(nameof(child.LastName), "Property is required for class Child.");
 
-            if (child.AgeOption.IsSet)
-                writer.WriteNumber("age", child.AgeOption.Value.Value);
+            if (child.FirstNameOption.IsSet && child.FirstName == null)
+                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
 
-            if (child.FirstNameOption.IsSet)
-                writer.WriteString("firstName", child.FirstName);
+            writer.WriteString("$_type", child.Type);
 
             if (child.LastNameOption.IsSet)
                 writer.WriteString("lastName", child.LastName);
 
-            writer.WriteString("$_type", child.Type);
+            if (child.FirstNameOption.IsSet)
+                writer.WriteString("firstName", child.FirstName);
+
+            if (child.AgeOption.IsSet)
+                writer.WriteNumber("age", child.AgeOption.Value.Value);
 
             if (child.BoosterSeatOption.IsSet)
                 writer.WriteBoolean("boosterSeat", child.BoosterSeatOption.Value.Value);
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
index c1944c790144..5746d070c507 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -32,30 +32,24 @@ public partial class Person : IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Person" /> class.
         /// </summary>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
         [JsonConstructor]
-        public Person(Option<string> firstName = default, Option<string> lastName = default)
+        public Person(Option<string> lastName = default, Option<string> firstName = default)
         {
-            FirstNameOption = firstName;
             LastNameOption = lastName;
+            FirstNameOption = firstName;
             OnCreated();
         }
 
         partial void OnCreated();
 
         /// <summary>
-        /// Used to track the state of FirstName
+        /// The discriminator
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -71,11 +65,17 @@ public Person(Option<string> firstName = default, Option<string> lastName = defa
         public string LastName { get { return this.LastNameOption; } set { this.LastNameOption = new Option<string>(value); } }
 
         /// <summary>
-        /// The discriminator
+        /// Used to track the state of FirstName
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -91,8 +91,8 @@ public override string ToString()
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Person {\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -141,9 +141,9 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
 
             string discriminator = ClientUtils.GetDiscriminator(utf8JsonReader, "$_type");
 
@@ -168,14 +168,14 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
                             break;
                         default:
                             break;
@@ -183,16 +183,16 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
                 }
             }
 
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Person.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
 
-            return new Person(firstName, lastName);
+            return new Person(lastName, firstName);
         }
 
         /// <summary>
@@ -229,19 +229,19 @@ public override void Write(Utf8JsonWriter writer, Person person, JsonSerializerO
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Person person, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (person.FirstNameOption.IsSet && person.FirstName == null)
-                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
-
             if (person.LastNameOption.IsSet && person.LastName == null)
                 throw new ArgumentNullException(nameof(person.LastName), "Property is required for class Person.");
 
-            if (person.FirstNameOption.IsSet)
-                writer.WriteString("firstName", person.FirstName);
+            if (person.FirstNameOption.IsSet && person.FirstName == null)
+                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
+
+            writer.WriteString("$_type", person.Type);
 
             if (person.LastNameOption.IsSet)
                 writer.WriteString("lastName", person.LastName);
 
-            writer.WriteString("$_type", person.Type);
+            if (person.FirstNameOption.IsSet)
+                writer.WriteString("firstName", person.FirstName);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
index 8e9abed3c227..e2408ad1694f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateTime date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumFormString = null)
+> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Header parameter enum test (string array) (optional) 
-            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
-            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumHeaderString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Header parameter enum test (string) (optional) 
+            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
             var enumQueryString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Query parameter enum test (string) (optional) 
-            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
             var enumQueryInteger = (TestEnumParametersEnumQueryIntegerParameter) "1";  // TestEnumParametersEnumQueryIntegerParameter | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
+            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumFormString = (TestEnumParametersRequestEnumFormString) "_abc";  // TestEnumParametersRequestEnumFormString |  (optional) 
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
-| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 | **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
-| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
+| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md
index 862c66f0beee..22460ea6d2ab 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 01eeeb00511b..b8b8d521149e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3347,33 +3347,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3383,9 +3383,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3393,12 +3393,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3410,22 +3410,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3437,19 +3437,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3491,7 +3491,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3781,32 +3781,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateTime> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3818,24 +3818,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3845,21 +3845,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3867,24 +3867,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3896,46 +3896,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3947,31 +3947,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3988,22 +3988,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4014,18 +4005,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4056,7 +4056,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4070,7 +4070,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4127,7 +4127,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
@@ -4153,17 +4153,17 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4174,14 +4174,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4190,17 +4190,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4213,33 +4213,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4252,16 +4252,16 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -4269,7 +4269,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             {
                 ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumQueryDouble, ref enumQueryInteger, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4288,14 +4288,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
+                    if (enumQueryDouble.IsSet)
+                        // here too
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
                     if (enumHeaderStringArray.IsSet)
@@ -4339,7 +4339,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4349,7 +4349,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4406,22 +4406,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4431,13 +4431,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4445,16 +4445,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4466,30 +4466,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4501,21 +4501,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4564,7 +4564,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4578,7 +4578,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
index d97995fd5ff2..0950c1b421fe 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2251,21 +2251,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2273,12 +2273,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2289,9 +2289,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2300,12 +2300,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2318,23 +2318,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2347,19 +2347,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2375,12 +2375,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2419,7 +2419,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2433,7 +2433,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2516,7 +2516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2537,13 +2537,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2553,10 +2553,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2564,13 +2564,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2582,24 +2582,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2611,12 +2611,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2624,7 +2624,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2684,7 +2684,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2698,7 +2698,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
index 721984089ad9..44be4ec0276f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
@@ -201,11 +201,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -213,11 +213,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2014,33 +2014,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2050,9 +2050,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2060,12 +2060,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2077,22 +2077,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2104,19 +2104,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2153,7 +2153,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2163,7 +2163,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/FakeApi.md
index 959c6b75e78d..3f5be967684a 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateTime date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index f0ab0b4ca0a3..0bb8c722d86a 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3347,33 +3347,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3383,9 +3383,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3393,12 +3393,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3410,22 +3410,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3437,19 +3437,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3491,7 +3491,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3781,32 +3781,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateTime> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3818,24 +3818,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3845,21 +3845,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3867,24 +3867,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3896,46 +3896,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3947,31 +3947,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3988,22 +3988,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4014,18 +4005,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4056,7 +4056,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4070,7 +4070,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4127,35 +4127,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4165,17 +4165,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4186,14 +4186,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4202,17 +4202,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4225,33 +4225,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4264,24 +4264,24 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4296,17 +4296,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4351,7 +4351,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4361,7 +4361,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4418,22 +4418,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4443,13 +4443,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4457,16 +4457,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4478,30 +4478,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4513,21 +4513,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4576,7 +4576,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4590,7 +4590,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 9693c8ffacd2..3eab5f44f1fe 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2251,21 +2251,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2273,12 +2273,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2289,9 +2289,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2300,12 +2300,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2318,23 +2318,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2347,19 +2347,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2375,12 +2375,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2419,7 +2419,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2433,7 +2433,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2516,7 +2516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2537,13 +2537,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2553,10 +2553,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2564,13 +2564,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2582,24 +2582,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2611,12 +2611,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2624,7 +2624,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2684,7 +2684,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2698,7 +2698,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index 721984089ad9..44be4ec0276f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -201,11 +201,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -213,11 +213,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2014,33 +2014,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2050,9 +2050,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2060,12 +2060,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2077,22 +2077,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2104,19 +2104,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2153,7 +2153,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2163,7 +2163,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Adult.md b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Adult.md
index 4bf74e4efc9b..61a97ca2192b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Adult.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Adult.md
@@ -5,9 +5,9 @@ A representation of an adult
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **Children** | [**List&lt;Child&gt;**](Child.md) |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Child.md b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Child.md
index bb2a1e5a5613..9ac30fd2d619 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Child.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Child.md
@@ -5,11 +5,11 @@ A representation of a child
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
-**Age** | **int** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **BoosterSeat** | **bool** |  | [optional] 
+**Age** | **int** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Person.md b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Person.md
index 42c19689f9a1..b41b51f12f2a 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Person.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/docs/models/Person.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 7806add08bde..d03f2d88895c 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -32,11 +32,11 @@ public partial class Adult : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Adult" /> class.
         /// </summary>
-        /// <param name="children">children</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="children">children</param>
         [JsonConstructor]
-        public Adult(Option<List<Child>> children = default, Option<string> firstName = default, Option<string> lastName = default) : base(firstName, lastName)
+        public Adult(Option<string> lastName = default, Option<string> firstName = default, Option<List<Child>> children = default) : base(lastName, firstName)
         {
             ChildrenOption = children;
             OnCreated();
@@ -44,6 +44,13 @@ public Adult(Option<List<Child>> children = default, Option<string> firstName =
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Adult";
+
         /// <summary>
         /// Used to track the state of Children
         /// </summary>
@@ -57,13 +64,6 @@ public Adult(Option<List<Child>> children = default, Option<string> firstName =
         [JsonPropertyName("children")]
         public List<Child> Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new Option<List<Child>>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -101,10 +101,10 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<List<Child>> children = default;
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
+            Option<List<Child>> children = default;
 
             while (utf8JsonReader.Read())
             {
@@ -121,18 +121,18 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "children":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                children = new Option<List<Child>>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions));
-                            break;
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
+                            break;
+                        case "children":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                children = new Option<List<Child>>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;
@@ -140,19 +140,19 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (children.IsSet && children.Value == null)
-                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Adult.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+
+            if (children.IsSet && children.Value == null)
+                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
 
-            return new Adult(children, firstName, lastName);
+            return new Adult(lastName, firstName, children);
         }
 
         /// <summary>
@@ -179,27 +179,28 @@ public override void Write(Utf8JsonWriter writer, Adult adult, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Adult adult, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (adult.ChildrenOption.IsSet && adult.Children == null)
-                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+            if (adult.LastNameOption.IsSet && adult.LastName == null)
+                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
 
             if (adult.FirstNameOption.IsSet && adult.FirstName == null)
                 throw new ArgumentNullException(nameof(adult.FirstName), "Property is required for class Adult.");
 
-            if (adult.LastNameOption.IsSet && adult.LastName == null)
-                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
+            if (adult.ChildrenOption.IsSet && adult.Children == null)
+                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+
+            writer.WriteString("$_type", adult.Type);
+
+            if (adult.LastNameOption.IsSet)
+                writer.WriteString("lastName", adult.LastName);
+
+            if (adult.FirstNameOption.IsSet)
+                writer.WriteString("firstName", adult.FirstName);
 
             if (adult.ChildrenOption.IsSet)
             {
                 writer.WritePropertyName("children");
                 JsonSerializer.Serialize(writer, adult.Children, jsonSerializerOptions);
             }
-            if (adult.FirstNameOption.IsSet)
-                writer.WriteString("firstName", adult.FirstName);
-
-            if (adult.LastNameOption.IsSet)
-                writer.WriteString("lastName", adult.LastName);
-
-            writer.WriteString("$_type", adult.Type);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 35adb6d48805..6d3836752c61 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -32,12 +32,12 @@ public partial class Child : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Child" /> class.
         /// </summary>
-        /// <param name="age">age</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="age">age</param>
         /// <param name="boosterSeat">boosterSeat</param>
         [JsonConstructor]
-        public Child(Option<int?> age = default, Option<string> firstName = default, Option<string> lastName = default, Option<bool?> boosterSeat = default) : base(firstName, lastName)
+        public Child(Option<string> lastName = default, Option<string> firstName = default, Option<int?> age = default, Option<bool?> boosterSeat = default) : base(lastName, firstName)
         {
             AgeOption = age;
             BoosterSeatOption = boosterSeat;
@@ -46,6 +46,13 @@ public Child(Option<int?> age = default, Option<string> firstName = default, Opt
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Child";
+
         /// <summary>
         /// Used to track the state of Age
         /// </summary>
@@ -59,13 +66,6 @@ public Child(Option<int?> age = default, Option<string> firstName = default, Opt
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new Option<int?>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
@@ -88,8 +88,8 @@ public override string ToString()
             StringBuilder sb = new StringBuilder();
             sb.Append("class Child {\n");
             sb.Append("  ").Append(base.ToString()?.Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("  BoosterSeat: ").Append(BoosterSeat).Append("\n");
+            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -117,10 +117,10 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<int?> age = default;
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
+            Option<int?> age = default;
             Option<bool?> boosterSeat = default;
 
             while (utf8JsonReader.Read())
@@ -138,18 +138,18 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "age":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                age = new Option<int?>(utf8JsonReader.GetInt32());
-                            break;
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
+                            break;
+                        case "age":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                age = new Option<int?>(utf8JsonReader.GetInt32());
                             break;
                         case "boosterSeat":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -161,22 +161,22 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (age.IsSet && age.Value == null)
-                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Child.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+
+            if (age.IsSet && age.Value == null)
+                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
 
             if (boosterSeat.IsSet && boosterSeat.Value == null)
                 throw new ArgumentNullException(nameof(boosterSeat), "Property is not nullable for class Child.");
 
-            return new Child(age, firstName, lastName, boosterSeat);
+            return new Child(lastName, firstName, age, boosterSeat);
         }
 
         /// <summary>
@@ -203,22 +203,22 @@ public override void Write(Utf8JsonWriter writer, Child child, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Child child, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (child.FirstNameOption.IsSet && child.FirstName == null)
-                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
-
             if (child.LastNameOption.IsSet && child.LastName == null)
                 throw new ArgumentNullException(nameof(child.LastName), "Property is required for class Child.");
 
-            if (child.AgeOption.IsSet)
-                writer.WriteNumber("age", child.AgeOption.Value.Value);
+            if (child.FirstNameOption.IsSet && child.FirstName == null)
+                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
 
-            if (child.FirstNameOption.IsSet)
-                writer.WriteString("firstName", child.FirstName);
+            writer.WriteString("$_type", child.Type);
 
             if (child.LastNameOption.IsSet)
                 writer.WriteString("lastName", child.LastName);
 
-            writer.WriteString("$_type", child.Type);
+            if (child.FirstNameOption.IsSet)
+                writer.WriteString("firstName", child.FirstName);
+
+            if (child.AgeOption.IsSet)
+                writer.WriteNumber("age", child.AgeOption.Value.Value);
 
             if (child.BoosterSeatOption.IsSet)
                 writer.WriteBoolean("boosterSeat", child.BoosterSeatOption.Value.Value);
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
index c1944c790144..5746d070c507 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -32,30 +32,24 @@ public partial class Person : IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Person" /> class.
         /// </summary>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
         [JsonConstructor]
-        public Person(Option<string> firstName = default, Option<string> lastName = default)
+        public Person(Option<string> lastName = default, Option<string> firstName = default)
         {
-            FirstNameOption = firstName;
             LastNameOption = lastName;
+            FirstNameOption = firstName;
             OnCreated();
         }
 
         partial void OnCreated();
 
         /// <summary>
-        /// Used to track the state of FirstName
+        /// The discriminator
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -71,11 +65,17 @@ public Person(Option<string> firstName = default, Option<string> lastName = defa
         public string LastName { get { return this.LastNameOption; } set { this.LastNameOption = new Option<string>(value); } }
 
         /// <summary>
-        /// The discriminator
+        /// Used to track the state of FirstName
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -91,8 +91,8 @@ public override string ToString()
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Person {\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -141,9 +141,9 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string> firstName = default;
-            Option<string> lastName = default;
             Option<string> type = default;
+            Option<string> lastName = default;
+            Option<string> firstName = default;
 
             string discriminator = ClientUtils.GetDiscriminator(utf8JsonReader, "$_type");
 
@@ -168,14 +168,14 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "firstName":
-                            firstName = new Option<string>(utf8JsonReader.GetString());
+                        case "$_type":
+                            type = new Option<string>(utf8JsonReader.GetString());
                             break;
                         case "lastName":
                             lastName = new Option<string>(utf8JsonReader.GetString());
                             break;
-                        case "$_type":
-                            type = new Option<string>(utf8JsonReader.GetString());
+                        case "firstName":
+                            firstName = new Option<string>(utf8JsonReader.GetString());
                             break;
                         default:
                             break;
@@ -183,16 +183,16 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
                 }
             }
 
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Person.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
 
-            return new Person(firstName, lastName);
+            return new Person(lastName, firstName);
         }
 
         /// <summary>
@@ -229,19 +229,19 @@ public override void Write(Utf8JsonWriter writer, Person person, JsonSerializerO
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Person person, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (person.FirstNameOption.IsSet && person.FirstName == null)
-                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
-
             if (person.LastNameOption.IsSet && person.LastName == null)
                 throw new ArgumentNullException(nameof(person.LastName), "Property is required for class Person.");
 
-            if (person.FirstNameOption.IsSet)
-                writer.WriteString("firstName", person.FirstName);
+            if (person.FirstNameOption.IsSet && person.FirstName == null)
+                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
+
+            writer.WriteString("$_type", person.Type);
 
             if (person.LastNameOption.IsSet)
                 writer.WriteString("lastName", person.LastName);
 
-            writer.WriteString("$_type", person.Type);
+            if (person.FirstNameOption.IsSet)
+                writer.WriteString("firstName", person.FirstName);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
index 8e9abed3c227..e2408ad1694f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateTime date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumFormString = null)
+> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Header parameter enum test (string array) (optional) 
-            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
-            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumHeaderString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Header parameter enum test (string) (optional) 
+            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
             var enumQueryString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Query parameter enum test (string) (optional) 
-            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
             var enumQueryInteger = (TestEnumParametersEnumQueryIntegerParameter) "1";  // TestEnumParametersEnumQueryIntegerParameter | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
+            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumFormString = (TestEnumParametersRequestEnumFormString) "_abc";  // TestEnumParametersRequestEnumFormString |  (optional) 
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
-| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 | **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
-| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
+| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md
index 862c66f0beee..22460ea6d2ab 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 01eeeb00511b..b8b8d521149e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3347,33 +3347,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3383,9 +3383,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3393,12 +3393,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3410,22 +3410,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3437,19 +3437,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3491,7 +3491,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3781,32 +3781,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateTime> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3818,24 +3818,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3845,21 +3845,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3867,24 +3867,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3896,46 +3896,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3947,31 +3947,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3988,22 +3988,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4014,18 +4005,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4056,7 +4056,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4070,7 +4070,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4127,7 +4127,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
@@ -4153,17 +4153,17 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4174,14 +4174,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4190,17 +4190,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4213,33 +4213,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4252,16 +4252,16 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -4269,7 +4269,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             {
                 ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumQueryDouble, ref enumQueryInteger, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4288,14 +4288,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
+                    if (enumQueryDouble.IsSet)
+                        // here too
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
                     if (enumHeaderStringArray.IsSet)
@@ -4339,7 +4339,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4349,7 +4349,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4406,22 +4406,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4431,13 +4431,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4445,16 +4445,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4466,30 +4466,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4501,21 +4501,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4564,7 +4564,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4578,7 +4578,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
index d97995fd5ff2..0950c1b421fe 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2251,21 +2251,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2273,12 +2273,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2289,9 +2289,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2300,12 +2300,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2318,23 +2318,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2347,19 +2347,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2375,12 +2375,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2419,7 +2419,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2433,7 +2433,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2516,7 +2516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2537,13 +2537,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2553,10 +2553,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2564,13 +2564,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2582,24 +2582,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2611,12 +2611,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2624,7 +2624,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2684,7 +2684,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2698,7 +2698,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
index 721984089ad9..44be4ec0276f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
@@ -201,11 +201,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -213,11 +213,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2014,33 +2014,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2050,9 +2050,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2060,12 +2060,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2077,22 +2077,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2104,19 +2104,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2153,7 +2153,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2163,7 +2163,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/FakeApi.md
index 959c6b75e78d..3f5be967684a 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateTime date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index f0ab0b4ca0a3..0bb8c722d86a 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3347,33 +3347,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3383,9 +3383,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3393,12 +3393,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3410,22 +3410,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3437,19 +3437,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3491,7 +3491,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3781,32 +3781,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateTime> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3818,24 +3818,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3845,21 +3845,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3867,24 +3867,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3896,46 +3896,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3947,31 +3947,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3988,22 +3988,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4014,18 +4005,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4056,7 +4056,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4070,7 +4070,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4127,35 +4127,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4165,17 +4165,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4186,14 +4186,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4202,17 +4202,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4225,33 +4225,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4264,24 +4264,24 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4296,17 +4296,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4351,7 +4351,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4361,7 +4361,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4418,22 +4418,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4443,13 +4443,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4457,16 +4457,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4478,30 +4478,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4513,21 +4513,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4576,7 +4576,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4590,7 +4590,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 9693c8ffacd2..3eab5f44f1fe 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2251,21 +2251,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2273,12 +2273,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2289,9 +2289,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2300,12 +2300,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2318,23 +2318,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2347,19 +2347,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2375,12 +2375,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2419,7 +2419,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2433,7 +2433,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2516,7 +2516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2537,13 +2537,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2553,10 +2553,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2564,13 +2564,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2582,24 +2582,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2611,12 +2611,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2624,7 +2624,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2684,7 +2684,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2698,7 +2698,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index 721984089ad9..44be4ec0276f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -201,11 +201,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -213,11 +213,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2014,33 +2014,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2050,9 +2050,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2060,12 +2060,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2077,22 +2077,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2104,19 +2104,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2153,7 +2153,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2163,7 +2163,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md
index 4bf74e4efc9b..61a97ca2192b 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md
@@ -5,9 +5,9 @@ A representation of an adult
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **Children** | [**List&lt;Child&gt;**](Child.md) |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md
index bb2a1e5a5613..9ac30fd2d619 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md
@@ -5,11 +5,11 @@ A representation of a child
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
-**Age** | **int** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **BoosterSeat** | **bool** |  | [optional] 
+**Age** | **int** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md
index 42c19689f9a1..b41b51f12f2a 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 5c879e6f980c..bf9ce3af17b2 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -34,11 +34,11 @@ public partial class Adult : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Adult" /> class.
         /// </summary>
-        /// <param name="children">children</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="children">children</param>
         [JsonConstructor]
-        public Adult(Option<List<Child>?> children = default, Option<string?> firstName = default, Option<string?> lastName = default) : base(firstName, lastName)
+        public Adult(Option<string?> lastName = default, Option<string?> firstName = default, Option<List<Child>?> children = default) : base(lastName, firstName)
         {
             ChildrenOption = children;
             OnCreated();
@@ -46,6 +46,13 @@ public Adult(Option<List<Child>?> children = default, Option<string?> firstName
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Adult";
+
         /// <summary>
         /// Used to track the state of Children
         /// </summary>
@@ -59,13 +66,6 @@ public Adult(Option<List<Child>?> children = default, Option<string?> firstName
         [JsonPropertyName("children")]
         public List<Child>? Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -103,10 +103,10 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<List<Child>?> children = default;
-            Option<string?> firstName = default;
-            Option<string?> lastName = default;
             Option<string?> type = default;
+            Option<string?> lastName = default;
+            Option<string?> firstName = default;
+            Option<List<Child>?> children = default;
 
             while (utf8JsonReader.Read())
             {
@@ -123,18 +123,18 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "children":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                children = new Option<List<Child>?>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions)!);
-                            break;
-                        case "firstName":
-                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "$_type":
+                            type = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
                         case "lastName":
                             lastName = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
-                        case "$_type":
-                            type = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "firstName":
+                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
+                            break;
+                        case "children":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                children = new Option<List<Child>?>(JsonSerializer.Deserialize<List<Child>>(ref utf8JsonReader, jsonSerializerOptions)!);
                             break;
                         default:
                             break;
@@ -142,19 +142,19 @@ public override Adult Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (children.IsSet && children.Value == null)
-                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Adult.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Adult.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Adult.");
+
+            if (children.IsSet && children.Value == null)
+                throw new ArgumentNullException(nameof(children), "Property is not nullable for class Adult.");
 
-            return new Adult(children, firstName, lastName);
+            return new Adult(lastName, firstName, children);
         }
 
         /// <summary>
@@ -181,27 +181,28 @@ public override void Write(Utf8JsonWriter writer, Adult adult, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Adult adult, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (adult.ChildrenOption.IsSet && adult.Children == null)
-                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+            if (adult.LastNameOption.IsSet && adult.LastName == null)
+                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
 
             if (adult.FirstNameOption.IsSet && adult.FirstName == null)
                 throw new ArgumentNullException(nameof(adult.FirstName), "Property is required for class Adult.");
 
-            if (adult.LastNameOption.IsSet && adult.LastName == null)
-                throw new ArgumentNullException(nameof(adult.LastName), "Property is required for class Adult.");
+            if (adult.ChildrenOption.IsSet && adult.Children == null)
+                throw new ArgumentNullException(nameof(adult.Children), "Property is required for class Adult.");
+
+            writer.WriteString("$_type", adult.Type);
+
+            if (adult.LastNameOption.IsSet)
+                writer.WriteString("lastName", adult.LastName);
+
+            if (adult.FirstNameOption.IsSet)
+                writer.WriteString("firstName", adult.FirstName);
 
             if (adult.ChildrenOption.IsSet)
             {
                 writer.WritePropertyName("children");
                 JsonSerializer.Serialize(writer, adult.Children, jsonSerializerOptions);
             }
-            if (adult.FirstNameOption.IsSet)
-                writer.WriteString("firstName", adult.FirstName);
-
-            if (adult.LastNameOption.IsSet)
-                writer.WriteString("lastName", adult.LastName);
-
-            writer.WriteString("$_type", adult.Type);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 426cf4706eee..179e556d9651 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -34,12 +34,12 @@ public partial class Child : Person, IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Child" /> class.
         /// </summary>
-        /// <param name="age">age</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
+        /// <param name="age">age</param>
         /// <param name="boosterSeat">boosterSeat</param>
         [JsonConstructor]
-        public Child(Option<int?> age = default, Option<string?> firstName = default, Option<string?> lastName = default, Option<bool?> boosterSeat = default) : base(firstName, lastName)
+        public Child(Option<string?> lastName = default, Option<string?> firstName = default, Option<int?> age = default, Option<bool?> boosterSeat = default) : base(lastName, firstName)
         {
             AgeOption = age;
             BoosterSeatOption = boosterSeat;
@@ -48,6 +48,13 @@ public Child(Option<int?> age = default, Option<string?> firstName = default, Op
 
         partial void OnCreated();
 
+        /// <summary>
+        /// The discriminator
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new string Type { get; } = "Child";
+
         /// <summary>
         /// Used to track the state of Age
         /// </summary>
@@ -61,13 +68,6 @@ public Child(Option<int?> age = default, Option<string?> firstName = default, Op
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
@@ -90,8 +90,8 @@ public override string ToString()
             StringBuilder sb = new StringBuilder();
             sb.Append("class Child {\n");
             sb.Append("  ").Append(base.ToString()?.Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("  BoosterSeat: ").Append(BoosterSeat).Append("\n");
+            sb.Append("  Age: ").Append(Age).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -119,10 +119,10 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<int?> age = default;
-            Option<string?> firstName = default;
-            Option<string?> lastName = default;
             Option<string?> type = default;
+            Option<string?> lastName = default;
+            Option<string?> firstName = default;
+            Option<int?> age = default;
             Option<bool?> boosterSeat = default;
 
             while (utf8JsonReader.Read())
@@ -140,18 +140,18 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "age":
-                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                age = new Option<int?>(utf8JsonReader.GetInt32());
-                            break;
-                        case "firstName":
-                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "$_type":
+                            type = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
                         case "lastName":
                             lastName = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
-                        case "$_type":
-                            type = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "firstName":
+                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
+                            break;
+                        case "age":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                age = new Option<int?>(utf8JsonReader.GetInt32());
                             break;
                         case "boosterSeat":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -163,22 +163,22 @@ public override Child Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
                 }
             }
 
-            if (age.IsSet && age.Value == null)
-                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
-
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Child.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Child.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Child.");
+
+            if (age.IsSet && age.Value == null)
+                throw new ArgumentNullException(nameof(age), "Property is not nullable for class Child.");
 
             if (boosterSeat.IsSet && boosterSeat.Value == null)
                 throw new ArgumentNullException(nameof(boosterSeat), "Property is not nullable for class Child.");
 
-            return new Child(age, firstName, lastName, boosterSeat);
+            return new Child(lastName, firstName, age, boosterSeat);
         }
 
         /// <summary>
@@ -205,22 +205,22 @@ public override void Write(Utf8JsonWriter writer, Child child, JsonSerializerOpt
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Child child, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (child.FirstNameOption.IsSet && child.FirstName == null)
-                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
-
             if (child.LastNameOption.IsSet && child.LastName == null)
                 throw new ArgumentNullException(nameof(child.LastName), "Property is required for class Child.");
 
-            if (child.AgeOption.IsSet)
-                writer.WriteNumber("age", child.AgeOption.Value!.Value);
+            if (child.FirstNameOption.IsSet && child.FirstName == null)
+                throw new ArgumentNullException(nameof(child.FirstName), "Property is required for class Child.");
 
-            if (child.FirstNameOption.IsSet)
-                writer.WriteString("firstName", child.FirstName);
+            writer.WriteString("$_type", child.Type);
 
             if (child.LastNameOption.IsSet)
                 writer.WriteString("lastName", child.LastName);
 
-            writer.WriteString("$_type", child.Type);
+            if (child.FirstNameOption.IsSet)
+                writer.WriteString("firstName", child.FirstName);
+
+            if (child.AgeOption.IsSet)
+                writer.WriteNumber("age", child.AgeOption.Value!.Value);
 
             if (child.BoosterSeatOption.IsSet)
                 writer.WriteBoolean("boosterSeat", child.BoosterSeatOption.Value!.Value);
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
index 73d27ba28c64..f5810cf24fb4 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -34,30 +34,24 @@ public partial class Person : IValidatableObject
         /// <summary>
         /// Initializes a new instance of the <see cref="Person" /> class.
         /// </summary>
-        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
+        /// <param name="firstName">firstName</param>
         [JsonConstructor]
-        public Person(Option<string?> firstName = default, Option<string?> lastName = default)
+        public Person(Option<string?> lastName = default, Option<string?> firstName = default)
         {
-            FirstNameOption = firstName;
             LastNameOption = lastName;
+            FirstNameOption = firstName;
             OnCreated();
         }
 
         partial void OnCreated();
 
         /// <summary>
-        /// Used to track the state of FirstName
+        /// The discriminator
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string?> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string? FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -73,11 +67,17 @@ public Person(Option<string?> firstName = default, Option<string?> lastName = de
         public string? LastName { get { return this.LastNameOption; } set { this.LastNameOption = new(value); } }
 
         /// <summary>
-        /// The discriminator
+        /// Used to track the state of FirstName
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string?> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string? FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -93,8 +93,8 @@ public override string ToString()
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Person {\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -143,9 +143,9 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<string?> firstName = default;
-            Option<string?> lastName = default;
             Option<string?> type = default;
+            Option<string?> lastName = default;
+            Option<string?> firstName = default;
 
             string? discriminator = ClientUtils.GetDiscriminator(utf8JsonReader, "$_type");
 
@@ -170,14 +170,14 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
 
                     switch (localVarJsonPropertyName)
                     {
-                        case "firstName":
-                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "$_type":
+                            type = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
                         case "lastName":
                             lastName = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
-                        case "$_type":
-                            type = new Option<string?>(utf8JsonReader.GetString()!);
+                        case "firstName":
+                            firstName = new Option<string?>(utf8JsonReader.GetString()!);
                             break;
                         default:
                             break;
@@ -185,16 +185,16 @@ public override Person Read(ref Utf8JsonReader utf8JsonReader, Type typeToConver
                 }
             }
 
-            if (firstName.IsSet && firstName.Value == null)
-                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
+            if (type.IsSet && type.Value == null)
+                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
 
             if (lastName.IsSet && lastName.Value == null)
                 throw new ArgumentNullException(nameof(lastName), "Property is not nullable for class Person.");
 
-            if (type.IsSet && type.Value == null)
-                throw new ArgumentNullException(nameof(type), "Property is not nullable for class Person.");
+            if (firstName.IsSet && firstName.Value == null)
+                throw new ArgumentNullException(nameof(firstName), "Property is not nullable for class Person.");
 
-            return new Person(firstName, lastName);
+            return new Person(lastName, firstName);
         }
 
         /// <summary>
@@ -231,19 +231,19 @@ public override void Write(Utf8JsonWriter writer, Person person, JsonSerializerO
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, Person person, JsonSerializerOptions jsonSerializerOptions)
         {
-            if (person.FirstNameOption.IsSet && person.FirstName == null)
-                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
-
             if (person.LastNameOption.IsSet && person.LastName == null)
                 throw new ArgumentNullException(nameof(person.LastName), "Property is required for class Person.");
 
-            if (person.FirstNameOption.IsSet)
-                writer.WriteString("firstName", person.FirstName);
+            if (person.FirstNameOption.IsSet && person.FirstName == null)
+                throw new ArgumentNullException(nameof(person.FirstName), "Property is required for class Person.");
+
+            writer.WriteString("$_type", person.Type);
 
             if (person.LastNameOption.IsSet)
                 writer.WriteString("lastName", person.LastName);
 
-            writer.WriteString("$_type", person.Type);
+            if (person.FirstNameOption.IsSet)
+                writer.WriteString("firstName", person.FirstName);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
index 47134bd4322c..56c764f21e1d 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateOnly date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateOnly** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumFormString = null)
+> void TestEnumParameters (List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Header parameter enum test (string array) (optional) 
-            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
-            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumHeaderString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Header parameter enum test (string) (optional) 
+            var enumQueryStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Query parameter enum test (string array) (optional) 
             var enumQueryString = (TestEnumParametersEnumHeaderStringParameter) "_abc";  // TestEnumParametersEnumHeaderStringParameter | Query parameter enum test (string) (optional) 
-            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
             var enumQueryInteger = (TestEnumParametersEnumQueryIntegerParameter) "1";  // TestEnumParametersEnumQueryIntegerParameter | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = (TestEnumParametersEnumQueryDoubleParameter) "1.1";  // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional) 
+            var enumFormStringArray = new List<TestEnumParametersRequestEnumFormStringArrayInner>(); // List<TestEnumParametersRequestEnumFormStringArrayInner> | Form parameter enum test (string array) (optional) 
             var enumFormString = (TestEnumParametersRequestEnumFormString) "_abc";  // TestEnumParametersRequestEnumFormString |  (optional) 
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
-| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 | **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
-| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
+| **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/PetApi.md
index 862c66f0beee..22460ea6d2ab 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 0dc06a0c06e6..462fecdedd00 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3355,33 +3355,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3391,9 +3391,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3401,12 +3401,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3418,22 +3418,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3445,19 +3445,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3499,7 +3499,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3509,7 +3509,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3790,32 +3790,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateOnly> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3827,24 +3827,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3854,21 +3854,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3876,24 +3876,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3905,46 +3905,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3956,31 +3956,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3997,22 +3997,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4023,18 +4014,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4065,7 +4065,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4079,7 +4079,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4136,7 +4136,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
@@ -4162,17 +4162,17 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4183,14 +4183,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4199,17 +4199,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4222,33 +4222,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4261,16 +4261,16 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumHeaderString">Header parameter enum test (string) (optional)</param>
+        /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="enumQueryString">Query parameter enum test (string) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional)</param>
         /// <param name="enumFormString"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -4278,7 +4278,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             {
                 ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumQueryDouble, ref enumQueryInteger, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4297,14 +4297,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
+                    if (enumQueryDouble.IsSet)
+                        // here too
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
                     if (enumHeaderStringArray.IsSet)
@@ -4348,7 +4348,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4358,7 +4358,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4415,22 +4415,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4440,13 +4440,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4454,16 +4454,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4475,30 +4475,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4510,21 +4510,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4574,7 +4574,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4588,7 +4588,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
index c75d22024d39..28c056333be1 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2255,21 +2255,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2277,12 +2277,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2293,9 +2293,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2304,12 +2304,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2322,23 +2322,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2351,19 +2351,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2379,12 +2379,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2424,7 +2424,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2438,7 +2438,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2521,7 +2521,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2542,13 +2542,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2558,10 +2558,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2569,13 +2569,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2587,24 +2587,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2616,12 +2616,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2629,7 +2629,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2690,7 +2690,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2704,7 +2704,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
index a6543a9dc4a8..b0652a34b365 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
@@ -202,11 +202,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -214,11 +214,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2053,33 +2053,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2089,9 +2089,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2099,12 +2099,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2116,22 +2116,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2143,19 +2143,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2192,7 +2192,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2202,7 +2202,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md
index 65edbb26576a..69bd40f60766 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateOnly date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateOnly** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
index 1f45ab88e837..b61a36084b0a 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -266,11 +266,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -278,11 +278,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>?&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -314,23 +314,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -338,23 +338,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -364,16 +364,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -382,16 +382,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -400,15 +400,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -416,15 +416,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>?&gt;</returns>
-        Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3357,33 +3357,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3393,9 +3393,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3403,12 +3403,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3420,22 +3420,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3447,19 +3447,19 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3511,7 +3511,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3792,32 +3792,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateOnly> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3829,24 +3829,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3856,21 +3856,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3878,24 +3878,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3907,46 +3907,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3958,31 +3958,31 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3999,22 +3999,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4025,18 +4016,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4067,7 +4067,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4081,7 +4081,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4138,35 +4138,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4176,17 +4176,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4197,14 +4197,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4213,17 +4213,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4236,33 +4236,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4275,24 +4275,24 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4307,17 +4307,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4362,7 +4362,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4372,7 +4372,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4429,22 +4429,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4454,13 +4454,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4468,16 +4468,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4489,30 +4489,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4524,21 +4524,21 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4588,7 +4588,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4602,7 +4602,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs
index 21ed363826b2..0cfce231e4c4 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs
@@ -212,11 +212,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -225,11 +225,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>?&gt;</returns>
-        Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -238,12 +238,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -251,12 +251,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>?&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2257,21 +2257,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2279,12 +2279,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2295,9 +2295,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2306,12 +2306,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2324,23 +2324,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2353,19 +2353,19 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2381,12 +2381,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string?, string?>> formParameterLocalVars = new List<KeyValuePair<string?, string?>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2426,7 +2426,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2440,7 +2440,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2523,7 +2523,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2544,13 +2544,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2560,10 +2560,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2571,13 +2571,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2589,24 +2589,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2618,12 +2618,12 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2631,7 +2631,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2692,7 +2692,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2706,7 +2706,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs
index 8752acf36790..77c43b5fe0e8 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs
@@ -204,11 +204,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -216,11 +216,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>?&gt;</returns>
-        Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2055,33 +2055,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2091,9 +2091,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2101,12 +2101,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2118,22 +2118,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2145,19 +2145,19 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2194,7 +2194,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2204,7 +2204,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md
index 65edbb26576a..69bd40f60766 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateOnly date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateOnly** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index c47a501885ea..08ac0cd287b9 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -264,11 +264,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -276,11 +276,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -312,23 +312,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -336,23 +336,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -362,16 +362,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -380,16 +380,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -398,15 +398,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -414,15 +414,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3355,33 +3355,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3391,9 +3391,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3401,12 +3401,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3418,22 +3418,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3445,19 +3445,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3499,7 +3499,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3509,7 +3509,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3790,32 +3790,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateOnly> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3827,24 +3827,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3854,21 +3854,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3876,24 +3876,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3905,46 +3905,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3956,31 +3956,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3997,22 +3997,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4023,18 +4014,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4065,7 +4065,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4079,7 +4079,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4136,35 +4136,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4174,17 +4174,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4195,14 +4195,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4211,17 +4211,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4234,33 +4234,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4273,24 +4273,24 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4305,17 +4305,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4360,7 +4360,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4370,7 +4370,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4427,22 +4427,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4452,13 +4452,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4466,16 +4466,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4487,30 +4487,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4522,21 +4522,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4586,7 +4586,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4600,7 +4600,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 1b402e88658c..fe5f2890a139 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -210,11 +210,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -249,12 +249,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2255,21 +2255,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2277,12 +2277,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2293,9 +2293,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2304,12 +2304,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2322,23 +2322,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2351,19 +2351,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2379,12 +2379,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2424,7 +2424,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2438,7 +2438,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2521,7 +2521,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2542,13 +2542,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2558,10 +2558,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2569,13 +2569,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2587,24 +2587,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2616,12 +2616,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2629,7 +2629,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2690,7 +2690,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2704,7 +2704,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index a6543a9dc4a8..b0652a34b365 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -202,11 +202,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -214,11 +214,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2053,33 +2053,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2089,9 +2089,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2099,12 +2099,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2116,22 +2116,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2143,19 +2143,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2192,7 +2192,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2202,7 +2202,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md
index 65edbb26576a..69bd40f60766 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateOnly date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateOnly** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
index 1f45ab88e837..b61a36084b0a 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -266,11 +266,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -278,11 +278,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>?&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -314,23 +314,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -338,23 +338,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -364,16 +364,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -382,16 +382,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -400,15 +400,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -416,15 +416,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>?&gt;</returns>
-        Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3357,33 +3357,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3393,9 +3393,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3403,12 +3403,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3420,22 +3420,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse?> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3447,19 +3447,19 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3501,7 +3501,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3511,7 +3511,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3792,32 +3792,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateOnly> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3829,24 +3829,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3856,21 +3856,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3878,24 +3878,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3907,46 +3907,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateOnly> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3958,31 +3958,31 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateOnly> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3999,22 +3999,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string?, string?>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4025,18 +4016,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string?, string?>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4067,7 +4067,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4081,7 +4081,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4138,35 +4138,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4176,17 +4176,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4197,14 +4197,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4213,17 +4213,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4236,33 +4236,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse?> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4275,24 +4275,24 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4307,17 +4307,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4362,7 +4362,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4372,7 +4372,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4429,22 +4429,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4454,13 +4454,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4468,16 +4468,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4489,30 +4489,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse?> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4524,21 +4524,21 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4588,7 +4588,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4602,7 +4602,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs
index 21ed363826b2..0cfce231e4c4 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs
@@ -212,11 +212,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -225,11 +225,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>?&gt;</returns>
-        Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -238,12 +238,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -251,12 +251,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>?&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2257,21 +2257,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2279,12 +2279,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2295,9 +2295,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2306,12 +2306,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2324,23 +2324,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse?> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2353,19 +2353,19 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2381,12 +2381,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string?, string?>> formParameterLocalVars = new List<KeyValuePair<string?, string?>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string?, string?>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2426,7 +2426,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2440,7 +2440,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2523,7 +2523,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2544,13 +2544,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2560,10 +2560,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2571,13 +2571,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2589,24 +2589,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2618,12 +2618,12 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2631,7 +2631,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2692,7 +2692,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2706,7 +2706,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs
index 8752acf36790..77c43b5fe0e8 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs
@@ -204,11 +204,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -216,11 +216,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>?&gt;</returns>
-        Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2055,33 +2055,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2091,9 +2091,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2101,12 +2101,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2118,22 +2118,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse?> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2145,19 +2145,19 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2194,7 +2194,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2204,7 +2204,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md
index 959c6b75e78d..3f5be967684a 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md
@@ -891,7 +891,7 @@ No authorization required
 
 <a id="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -912,12 +912,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var user = new User(); // User | 
             var query = "query_example";  // string | 
+            var user = new User(); // User | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(user, query);
+                apiInstance.TestBodyWithQueryParams(query, user);
             }
             catch (ApiException  e)
             {
@@ -936,7 +936,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
 }
 catch (ApiException e)
 {
@@ -950,8 +950,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -1067,7 +1067,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int integer = null, int int32 = null, long int64 = null, float varFloat = null, string varString = null, System.IO.Stream binary = null, DateTime date = null, DateTime dateTime = null, string password = null, string callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1094,25 +1094,25 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
-            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
-            var varFloat = 3.4F;  // float | None (optional) 
+            var varByte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var integer = 56;  // int | None (optional) 
             var int32 = 56;  // int | None (optional) 
             var int64 = 789L;  // long | None (optional) 
+            var varFloat = 3.4F;  // float | None (optional) 
             var varString = "varString_example";  // string | None (optional) 
+            var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
+            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string | None (optional) 
             var callback = "callback_example";  // string | None (optional) 
-            var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
 
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             }
             catch (ApiException  e)
             {
@@ -1132,7 +1132,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 }
 catch (ApiException e)
 {
@@ -1146,20 +1146,20 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **varByte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **varFloat** | **float** | None | [optional]  |
+| **varByte** | **byte[]** | None |  |
 | **integer** | **int** | None | [optional]  |
 | **int32** | **int** | None | [optional]  |
 | **int64** | **long** | None | [optional]  |
+| **varFloat** | **float** | None | [optional]  |
 | **varString** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime** | None | [optional]  |
+| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
-| **dateTime** | **DateTime** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 
 ### Return type
 
@@ -1185,7 +1185,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, double enumQueryDouble = null, int enumQueryInteger = null, List<string> enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null)
+> void TestEnumParameters (List<string> enumHeaderStringArray = null, string enumHeaderString = null, List<string> enumQueryStringArray = null, string enumQueryString = null, int enumQueryInteger = null, double enumQueryDouble = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -1209,18 +1209,18 @@ namespace Example
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
+            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
+            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumQueryInteger = 1;  // int | Query parameter enum test (double) (optional) 
+            var enumQueryDouble = 1.1D;  // double | Query parameter enum test (double) (optional) 
             var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
-            var enumHeaderString = "_abc";  // string | Header parameter enum test (string) (optional)  (default to -efg)
-            var enumQueryString = "_abc";  // string | Query parameter enum test (string) (optional)  (default to -efg)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -1240,7 +1240,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -1255,12 +1255,12 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
+| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryInteger** | **int** | Query parameter enum test (double) | [optional]  |
+| **enumQueryDouble** | **double** | Query parameter enum test (double) | [optional]  |
 | **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
-| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
-| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1287,7 +1287,7 @@ No authorization required
 
 <a id="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool booleanGroup = null, int stringGroup = null, long int64Group = null)
+> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int stringGroup = null, bool booleanGroup = null, long int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1313,17 +1313,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredStringGroup = 56;  // int | Required String in group parameters
+            var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var stringGroup = 56;  // int | String in group parameters (optional) 
+            var booleanGroup = true;  // bool | Boolean in group parameters (optional) 
             var int64Group = 789L;  // long | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1343,7 +1343,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1357,11 +1357,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredStringGroup** | **int** | Required String in group parameters |  |
+| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **stringGroup** | **int** | String in group parameters | [optional]  |
+| **booleanGroup** | **bool** | Boolean in group parameters | [optional]  |
 | **int64Group** | **long** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md
index 407fb30dccb4..8c1a5736b73f 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md
@@ -668,7 +668,7 @@ void (empty response body)
 
 <a id="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
+> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
 
 uploads an image
 
@@ -693,13 +693,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -720,7 +720,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -738,8 +738,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
+| **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
 
 ### Return type
 
@@ -764,7 +764,7 @@ catch (ApiException e)
 
 <a id="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -788,14 +788,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var petId = 789L;  // long | ID of pet to update
+            var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | file to upload
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -816,7 +816,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -833,8 +833,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **petId** | **long** | ID of pet to update |  |
+| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md
index ee189c866ec5..8a761998fdbd 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md
@@ -625,7 +625,7 @@ No authorization required
 
 <a id="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -648,13 +648,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var user = new User(); // User | Updated user object
             var username = "username_example";  // string | name that need to be deleted
+            var user = new User(); // User | Updated user object
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(user, username);
+                apiInstance.UpdateUser(username, user);
             }
             catch (ApiException  e)
             {
@@ -674,7 +674,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(user, username);
+    apiInstance.UpdateUserWithHttpInfo(username, user);
 }
 catch (ApiException e)
 {
@@ -688,8 +688,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) | Updated user object |  |
 | **username** | **string** | name that need to be deleted |  |
+| **user** | [**User**](User.md) | Updated user object |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index e386a6d58096..3f994da4c5fa 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -263,11 +263,11 @@ public interface IFakeApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 
@@ -275,11 +275,11 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -311,23 +311,23 @@ public interface IFakeApi : IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -335,23 +335,23 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -361,16 +361,16 @@ public interface IFakeApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -379,16 +379,16 @@ public interface IFakeApi : IApi
         /// To test enum parameters
         /// </remarks>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -397,15 +397,15 @@ public interface IFakeApi : IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -413,15 +413,15 @@ public interface IFakeApi : IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// test inline additionalProperties
@@ -3346,33 +3346,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestBodyWithQueryParams(User user, ref string query);
+        partial void FormatTestBodyWithQueryParams(ref string query, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateTestBodyWithQueryParams(User user, string query)
+        private void ValidateTestBodyWithQueryParams(string query, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (query == null)
                 throw new ArgumentNullException(nameof(query));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query)
+        /// <param name="user"></param>
+        private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user)
         {
             bool suppressDefaultLog = false;
-            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, user, query);
+            AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3382,9 +3382,9 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, User user, string query);
+        /// <param name="user"></param>
+        partial void AfterTestBodyWithQueryParams(ref bool suppressDefaultLog, ITestBodyWithQueryParamsApiResponse apiResponseLocalVar, string query, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3392,12 +3392,12 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception exception, string pathFormat, string path, string query, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, user, query);
+            OnErrorTestBodyWithQueryParams(ref suppressDefaultLog, exception, pathFormat, path, query, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3409,22 +3409,22 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string query);
+        /// <param name="user"></param>
+        partial void OnErrorTestBodyWithQueryParams(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string query, User user);
 
         /// <summary>
         ///  
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOrDefaultAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestBodyWithQueryParamsAsync(user, query, cancellationToken).ConfigureAwait(false);
+                return await TestBodyWithQueryParamsAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3436,19 +3436,19 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsOr
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestBodyWithQueryParamsApiResponse"/>&gt;</returns>
-        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestBodyWithQueryParams(user, query);
+                ValidateTestBodyWithQueryParams(query, user);
 
-                FormatTestBodyWithQueryParams(user, ref query);
+                FormatTestBodyWithQueryParams(ref query, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3490,7 +3490,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
 
                         TestBodyWithQueryParamsApiResponse apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, user, query);
+                        AfterTestBodyWithQueryParamsDefaultImplementation(apiResponseLocalVar, query, user);
 
                         Events.ExecuteOnTestBodyWithQueryParams(apiResponseLocalVar);
 
@@ -3500,7 +3500,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query);
+                OnErrorTestBodyWithQueryParamsDefaultImplementation(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, query, user);
                 Events.ExecuteOnErrorTestBodyWithQueryParams(e);
                 throw;
             }
@@ -3780,32 +3780,32 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref byte[] varByte, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<float> varFloat, ref Option<string> varString, ref Option<System.IO.Stream> binary, ref Option<DateTime> date, ref Option<DateTime> dateTime, ref Option<string> password, ref Option<string> callback);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="varByte"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="binary"></param>
+        /// <param name="varByte"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <returns></returns>
-        private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
+        private void ValidateTestEndpointParameters(string patternWithoutDelimiter, byte[] varByte, Option<string> varString, Option<System.IO.Stream> binary, Option<string> password, Option<string> callback)
         {
-            if (varByte == null)
-                throw new ArgumentNullException(nameof(varByte));
-
             if (patternWithoutDelimiter == null)
                 throw new ArgumentNullException(nameof(patternWithoutDelimiter));
 
-            if (binary.IsSet && binary.Value == null)
-                throw new ArgumentNullException(nameof(binary));
+            if (varByte == null)
+                throw new ArgumentNullException(nameof(varByte));
 
             if (varString.IsSet && varString.Value == null)
                 throw new ArgumentNullException(nameof(varString));
 
+            if (binary.IsSet && binary.Value == null)
+                throw new ArgumentNullException(nameof(binary));
+
             if (password.IsSet && password.Value == null)
                 throw new ArgumentNullException(nameof(password));
 
@@ -3817,24 +3817,24 @@ private void ValidateTestEndpointParameters(byte[] varByte, string patternWithou
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -3844,21 +3844,21 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3866,24 +3866,24 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3895,46 +3895,46 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="varByte"></param>
         /// <param name="number"></param>
         /// <param name="varDouble"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="varFloat"></param>
+        /// <param name="varByte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="varFloat"></param>
         /// <param name="varString"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
+        /// <param name="dateTime"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
-        /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer, Option<int> int32, Option<long> int64, Option<float> varFloat, Option<string> varString, Option<System.IO.Stream> binary, Option<DateTime> date, Option<DateTime> dateTime, Option<string> password, Option<string> callback);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                return await TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -3946,31 +3946,31 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDe
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="varByte">None</param>
         /// <param name="number">None</param>
         /// <param name="varDouble">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="varFloat">None (optional)</param>
+        /// <param name="varByte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="varFloat">None (optional)</param>
         /// <param name="varString">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="password">None (optional)</param>
         /// <param name="callback">None (optional)</param>
-        /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<float> varFloat = default, Option<string> varString = default, Option<System.IO.Stream> binary = default, Option<DateTime> date = default, Option<DateTime> dateTime = default, Option<string> password = default, Option<string> callback = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
+                ValidateTestEndpointParameters(patternWithoutDelimiter, varByte, varString, binary, password, callback);
 
-                FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
+                FormatTestEndpointParameters(ref number, ref varDouble, ref patternWithoutDelimiter, ref varByte, ref integer, ref int32, ref int64, ref varFloat, ref varString, ref binary, ref date, ref dateTime, ref password, ref callback);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -3987,22 +3987,13 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                     multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));
 
-                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
-
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("double", ClientUtils.ParameterToString(varDouble)));
 
                     formParameterLocalVars.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
-
-                    if (binary.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
-
-                    if (varFloat.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+                    formParameterLocalVars.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(varByte)));
 
                     if (integer.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer.Value)));
@@ -4013,18 +4004,27 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
                     if (int64.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64.Value)));
 
+                    if (varFloat.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(varFloat.Value)));
+
                     if (varString.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(varString.Value)));
 
+                    if (binary.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(binary.Value));
+
+                    if (date.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date.Value)));
+
+                    if (dateTime.IsSet)
+                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
+
                     if (password.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password.Value)));
 
                     if (callback.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("callback", ClientUtils.ParameterToString(callback.Value)));
 
-                    if (dateTime.IsSet)
-                        formParameterLocalVars.Add(new KeyValuePair<string, string>("dateTime", ClientUtils.ParameterToString(dateTime.Value)));
-
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -4055,7 +4055,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
 
                         TestEndpointParametersApiResponse apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                        AfterTestEndpointParametersDefaultImplementation(apiResponseLocalVar, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
 
                         Events.ExecuteOnTestEndpointParameters(apiResponseLocalVar);
 
@@ -4069,7 +4069,7 @@ public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsyn
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+                OnErrorTestEndpointParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
                 Events.ExecuteOnErrorTestEndpointParameters(e);
                 throw;
             }
@@ -4126,35 +4126,35 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, ref Option<double> enumQueryDouble, ref Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, ref Option<string> enumHeaderString, ref Option<string> enumQueryString, ref Option<string> enumFormString);
+        partial void FormatTestEnumParameters(Option<List<string>> enumHeaderStringArray, ref Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, ref Option<string> enumQueryString, ref Option<int> enumQueryInteger, ref Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, ref Option<string> enumFormString);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
-        /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
+        /// <param name="enumQueryStringArray"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderStringArray));
 
-            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumQueryStringArray));
-
-            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
-                throw new ArgumentNullException(nameof(enumFormStringArray));
-
             if (enumHeaderString.IsSet && enumHeaderString.Value == null)
                 throw new ArgumentNullException(nameof(enumHeaderString));
 
+            if (enumQueryStringArray.IsSet && enumQueryStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumQueryStringArray));
+
             if (enumQueryString.IsSet && enumQueryString.Value == null)
                 throw new ArgumentNullException(nameof(enumQueryString));
 
+            if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
+                throw new ArgumentNullException(nameof(enumFormStringArray));
+
             if (enumFormString.IsSet && enumFormString.Value == null)
                 throw new ArgumentNullException(nameof(enumFormString));
         }
@@ -4164,17 +4164,17 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4185,14 +4185,14 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4201,17 +4201,17 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            OnErrorTestEnumParameters(ref suppressDefaultLog, exception, pathFormat, path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4224,33 +4224,33 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exception,
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
+        /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryString"></param>
         /// <param name="enumQueryInteger"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumFormStringArray"></param>
-        /// <param name="enumHeaderString"></param>
-        /// <param name="enumQueryString"></param>
         /// <param name="enumFormString"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<double> enumQueryDouble, Option<int> enumQueryInteger, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, Option<List<string>> enumHeaderStringArray, Option<string> enumHeaderString, Option<List<string>> enumQueryStringArray, Option<string> enumQueryString, Option<int> enumQueryInteger, Option<double> enumQueryDouble, Option<List<string>> enumFormStringArray, Option<string> enumFormString);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
         /// </summary>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                return await TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4263,24 +4263,24 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="enumHeaderStringArray">Header parameter enum test (string array) (optional)</param>
+        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
-        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
-        /// <param name="enumHeaderString">Header parameter enum test (string) (optional, default to -efg)</param>
-        /// <param name="enumQueryString">Query parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="enumFormString">Form parameter enum test (string) (optional, default to -efg)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<List<string>> enumQueryStringArray = default, Option<double> enumQueryDouble = default, Option<int> enumQueryInteger = default, Option<List<string>> enumFormStringArray = default, Option<string> enumHeaderString = default, Option<string> enumQueryString = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<List<string>> enumHeaderStringArray = default, Option<string> enumHeaderString = default, Option<List<string>> enumQueryStringArray = default, Option<string> enumQueryString = default, Option<int> enumQueryInteger = default, Option<double> enumQueryDouble = default, Option<List<string>> enumFormStringArray = default, Option<string> enumFormString = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                ValidateTestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumFormStringArray, enumFormString);
 
-                FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
+                FormatTestEnumParameters(enumHeaderStringArray, ref enumHeaderString, enumQueryStringArray, ref enumQueryString, ref enumQueryInteger, ref enumQueryDouble, enumFormStringArray, ref enumFormString);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4295,17 +4295,17 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                         // here too
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
+                    if (enumQueryString.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         // here too
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
+                    if (enumQueryDouble.IsSet)
                         // here too
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
@@ -4350,7 +4350,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
 
                         TestEnumParametersApiResponse apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                        AfterTestEnumParametersDefaultImplementation(apiResponseLocalVar, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
                         Events.ExecuteOnTestEnumParameters(apiResponseLocalVar);
 
@@ -4360,7 +4360,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
                 Events.ExecuteOnErrorTestEnumParameters(e);
                 throw;
             }
@@ -4417,22 +4417,22 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestGroupParameters(ref bool requiredBooleanGroup, ref int requiredStringGroup, ref long requiredInt64Group, ref Option<bool> booleanGroup, ref Option<int> stringGroup, ref Option<long> int64Group);
+        partial void FormatTestGroupParameters(ref int requiredStringGroup, ref bool requiredBooleanGroup, ref long requiredInt64Group, ref Option<int> stringGroup, ref Option<bool> booleanGroup, ref Option<long> int64Group);
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -4442,13 +4442,13 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void AfterTestGroupParameters(ref bool suppressDefaultLog, ITestGroupParametersApiResponse apiResponseLocalVar, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4456,16 +4456,16 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group)
+        private void OnErrorTestGroupParametersDefaultImplementation(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group)
         {
             bool suppressDefaultLog = false;
-            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            OnErrorTestGroupParameters(ref suppressDefaultLog, exception, pathFormat, path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -4477,30 +4477,30 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredStringGroup"></param>
+        /// <param name="requiredBooleanGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="booleanGroup"></param>
         /// <param name="stringGroup"></param>
+        /// <param name="booleanGroup"></param>
         /// <param name="int64Group"></param>
-        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup, Option<int> stringGroup, Option<long> int64Group);
+        partial void OnErrorTestGroupParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup, Option<bool> booleanGroup, Option<long> int64Group);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                return await TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -4512,21 +4512,21 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersOrDefaultA
         /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional)
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredStringGroup">Required String in group parameters</param>
+        /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="stringGroup">String in group parameters (optional)</param>
+        /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
         /// <param name="int64Group">Integer in group parameters (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestGroupParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, Option<bool> booleanGroup = default, Option<int> stringGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, Option<int> stringGroup = default, Option<bool> booleanGroup = default, Option<long> int64Group = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                FormatTestGroupParameters(ref requiredBooleanGroup, ref requiredStringGroup, ref requiredInt64Group, ref booleanGroup, ref stringGroup, ref int64Group);
+                FormatTestGroupParameters(ref requiredStringGroup, ref requiredBooleanGroup, ref requiredInt64Group, ref stringGroup, ref booleanGroup, ref int64Group);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -4575,7 +4575,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
 
                         TestGroupParametersApiResponse apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                        AfterTestGroupParametersDefaultImplementation(apiResponseLocalVar, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
                         Events.ExecuteOnTestGroupParameters(apiResponseLocalVar);
 
@@ -4589,7 +4589,7 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParametersDefaultImplementation(e, "/fake", uriBuilderLocalVar.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 Events.ExecuteOnErrorTestGroupParameters(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 88051a3d0053..0f1ecb7060e0 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -209,11 +209,11 @@ public interface IPetApi : IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image
@@ -222,11 +222,11 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -235,12 +235,12 @@ public interface IPetApi : IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// uploads an image (required)
@@ -248,12 +248,12 @@ public interface IPetApi : IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2250,21 +2250,21 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFile(ref long petId, ref Option<System.IO.Stream> file, ref Option<string> additionalMetadata);
+        partial void FormatUploadFile(ref long petId, ref Option<string> additionalMetadata, ref Option<System.IO.Stream> file);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
-            if (file.IsSet && file.Value == null)
-                throw new ArgumentNullException(nameof(file));
-
             if (additionalMetadata.IsSet && additionalMetadata.Value == null)
                 throw new ArgumentNullException(nameof(additionalMetadata));
+
+            if (file.IsSet && file.Value == null)
+                throw new ArgumentNullException(nameof(file));
         }
 
         /// <summary>
@@ -2272,12 +2272,12 @@ private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> ad
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, file, additionalMetadata);
+            AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2288,9 +2288,9 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void AfterUploadFile(ref bool suppressDefaultLog, IUploadFileApiResponse apiResponseLocalVar, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2299,12 +2299,12 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata)
+        /// <param name="file"></param>
+        private void OnErrorUploadFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, file, additionalMetadata);
+            OnErrorUploadFile(ref suppressDefaultLog, exception, pathFormat, path, petId, additionalMetadata, file);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2317,23 +2317,23 @@ private void OnErrorUploadFileDefaultImplementation(Exception exception, string
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<System.IO.Stream> file, Option<string> additionalMetadata);
+        /// <param name="file"></param>
+        partial void OnErrorUploadFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, Option<string> additionalMetadata, Option<System.IO.Stream> file);
 
         /// <summary>
         /// uploads an image 
         /// </summary>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2346,19 +2346,19 @@ public async Task<IUploadFileApiResponse> UploadFileOrDefaultAsync(long petId, O
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="file">file to upload (optional)</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<System.IO.Stream> file = default, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<string> additionalMetadata = default, Option<System.IO.Stream> file = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUploadFile(file, additionalMetadata);
+                ValidateUploadFile(additionalMetadata, file);
 
-                FormatUploadFile(ref petId, ref file, ref additionalMetadata);
+                FormatUploadFile(ref petId, ref additionalMetadata, ref file);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2374,12 +2374,12 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                     List<KeyValuePair<string, string>> formParameterLocalVars = new List<KeyValuePair<string, string>>();
 
-                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (file.IsSet)
-                        multipartContentLocalVar.Add(new StreamContent(file.Value));
-
-                    if (additionalMetadata.IsSet)
+                    multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));                    if (additionalMetadata.IsSet)
                         formParameterLocalVars.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata.Value)));
 
+                    if (file.IsSet)
+                        multipartContentLocalVar.Add(new StreamContent(file.Value));
+
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
                     httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
 
@@ -2418,7 +2418,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
 
                         UploadFileApiResponse apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, file, additionalMetadata);
+                        AfterUploadFileDefaultImplementation(apiResponseLocalVar, petId, additionalMetadata, file);
 
                         Events.ExecuteOnUploadFile(apiResponseLocalVar);
 
@@ -2432,7 +2432,7 @@ public async Task<IUploadFileApiResponse> UploadFileAsync(long petId, Option<Sys
             }
             catch(Exception e)
             {
-                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata);
+                OnErrorUploadFileDefaultImplementation(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, additionalMetadata, file);
                 Events.ExecuteOnErrorUploadFile(e);
                 throw;
             }
@@ -2515,7 +2515,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUploadFileWithRequiredFile(ref System.IO.Stream requiredFile, ref long petId, ref Option<string> additionalMetadata);
+        partial void FormatUploadFileWithRequiredFile(ref long petId, ref System.IO.Stream requiredFile, ref Option<string> additionalMetadata);
 
         /// <summary>
         /// Validates the request parameters
@@ -2536,13 +2536,13 @@ private void ValidateUploadFileWithRequiredFile(System.IO.Stream requiredFile, O
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+            AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2552,10 +2552,10 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void AfterUploadFileWithRequiredFile(ref bool suppressDefaultLog, IUploadFileWithRequiredFileApiResponse apiResponseLocalVar, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2563,13 +2563,13 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata)
+        private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata)
         {
             bool suppressDefaultLog = false;
-            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, requiredFile, petId, additionalMetadata);
+            OnErrorUploadFileWithRequiredFile(ref suppressDefaultLog, exception, pathFormat, path, petId, requiredFile, additionalMetadata);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2581,24 +2581,24 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata);
+        partial void OnErrorUploadFileWithRequiredFile(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata);
 
         /// <summary>
         /// uploads an image (required) 
         /// </summary>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                return await UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2610,12 +2610,12 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredFile">file to upload</param>
         /// <param name="petId">ID of pet to update</param>
+        /// <param name="requiredFile">file to upload</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUploadFileWithRequiredFileApiResponse"/>&gt;</returns>
-        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, Option<string> additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
@@ -2623,7 +2623,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             {
                 ValidateUploadFileWithRequiredFile(requiredFile, additionalMetadata);
 
-                FormatUploadFileWithRequiredFile(ref requiredFile, ref petId, ref additionalMetadata);
+                FormatUploadFileWithRequiredFile(ref petId, ref requiredFile, ref additionalMetadata);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2683,7 +2683,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
 
                         UploadFileWithRequiredFileApiResponse apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, requiredFile, petId, additionalMetadata);
+                        AfterUploadFileWithRequiredFileDefaultImplementation(apiResponseLocalVar, petId, requiredFile, additionalMetadata);
 
                         Events.ExecuteOnUploadFileWithRequiredFile(apiResponseLocalVar);
 
@@ -2697,7 +2697,7 @@ public async Task<IUploadFileWithRequiredFileApiResponse> UploadFileWithRequired
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFileDefaultImplementation(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, petId, requiredFile, additionalMetadata);
                 Events.ExecuteOnErrorUploadFileWithRequiredFile(e);
                 throw;
             }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index 375b1aa874e8..1775ff7442e4 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -200,11 +200,11 @@ public interface IUserApi : IApi
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updated user
@@ -212,11 +212,11 @@ public interface IUserApi : IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default);
+        Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default);
     }
 
     /// <summary>
@@ -2013,33 +2013,33 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatUpdateUser(User user, ref string username);
+        partial void FormatUpdateUser(ref string username, User user);
 
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        private void ValidateUpdateUser(User user, string username)
+        private void ValidateUpdateUser(string username, User user)
         {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
             if (username == null)
                 throw new ArgumentNullException(nameof(username));
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, User user, string username)
+        /// <param name="user"></param>
+        private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResponseLocalVar, string username, User user)
         {
             bool suppressDefaultLog = false;
-            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username);
+            AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, username, user);
             if (!suppressDefaultLog)
                 Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
         }
@@ -2049,9 +2049,9 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// </summary>
         /// <param name="suppressDefaultLog"></param>
         /// <param name="apiResponseLocalVar"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, User user, string username);
+        /// <param name="user"></param>
+        partial void AfterUpdateUser(ref bool suppressDefaultLog, IUpdateUserApiResponse apiResponseLocalVar, string username, User user);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -2059,12 +2059,12 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        private void OnErrorUpdateUserDefaultImplementation(Exception exception, string pathFormat, string path, string username, User user)
         {
             bool suppressDefaultLog = false;
-            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, user, username);
+            OnErrorUpdateUser(ref suppressDefaultLog, exception, pathFormat, path, username, user);
             if (!suppressDefaultLog)
                 Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2076,22 +2076,22 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exception, string
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, User user, string username);
+        /// <param name="user"></param>
+        partial void OnErrorUpdateUser(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, string username, User user);
 
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
-                return await UpdateUserAsync(user, username, cancellationToken).ConfigureAwait(false);
+                return await UpdateUserAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2103,19 +2103,19 @@ public async Task<IUpdateUserApiResponse> UpdateUserOrDefaultAsync(User user, st
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="user">Updated user object</param>
         /// <param name="username">name that need to be deleted</param>
+        /// <param name="user">Updated user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="IUpdateUserApiResponse"/>&gt;</returns>
-        public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<IUpdateUserApiResponse> UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
             try
             {
-                ValidateUpdateUser(user, username);
+                ValidateUpdateUser(username, user);
 
-                FormatUpdateUser(user, ref username);
+                FormatUpdateUser(ref username, user);
 
                 using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
                 {
@@ -2152,7 +2152,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
 
                         UpdateUserApiResponse apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions);
 
-                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, user, username);
+                        AfterUpdateUserDefaultImplementation(apiResponseLocalVar, username, user);
 
                         Events.ExecuteOnUpdateUser(apiResponseLocalVar);
 
@@ -2162,7 +2162,7 @@ public async Task<IUpdateUserApiResponse> UpdateUserAsync(User user, string user
             }
             catch(Exception e)
             {
-                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, user, username);
+                OnErrorUpdateUserDefaultImplementation(e, "/user/{username}", uriBuilderLocalVar.Path, username, user);
                 Events.ExecuteOnErrorUpdateUser(e);
                 throw;
             }

From 99ae292ad930f17ae4417d8e33656895b84aee7c Mon Sep 17 00:00:00 2001
From: devhl <shawnkanyer@gmail.com>
Date: Sun, 14 Jul 2024 17:22:17 -0400
Subject: [PATCH 3/4] rebuild tests

---
 .../Org.OpenAPITools.Test/Model/ChildTests.cs | 12 ++++----
 .../Model/PersonTests.cs                      | 12 ++++----
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Model/ChildTests.cs | 12 ++++----
 .../Model/PersonTests.cs                      | 12 ++++----
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Model/ChildTests.cs | 12 ++++----
 .../Model/PersonTests.cs                      | 12 ++++----
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 30 +++++++++----------
 .../Org.OpenAPITools.Test/Api/PetApiTests.cs  |  8 ++---
 .../Org.OpenAPITools.Test/Api/UserApiTests.cs |  4 +--
 33 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
index 17720f6e735f..10c2f96d3a20 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
@@ -54,21 +54,21 @@ public void ChildInstanceTest()
         }
 
         /// <summary>
-        /// Test the property 'Age'
+        /// Test the property 'BoosterSeat'
         /// </summary>
         [Fact]
-        public void AgeTest()
+        public void BoosterSeatTest()
         {
-            // TODO unit test for the property 'Age'
+            // TODO unit test for the property 'BoosterSeat'
         }
 
         /// <summary>
-        /// Test the property 'BoosterSeat'
+        /// Test the property 'Age'
         /// </summary>
         [Fact]
-        public void BoosterSeatTest()
+        public void AgeTest()
         {
-            // TODO unit test for the property 'BoosterSeat'
+            // TODO unit test for the property 'Age'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
index aa3fc482188d..93161acf9fe6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
@@ -74,12 +74,12 @@ public void ChildDeserializeFromPersonTest()
         }
 
         /// <summary>
-        /// Test the property 'FirstName'
+        /// Test the property 'Type'
         /// </summary>
         [Fact]
-        public void FirstNameTest()
+        public void TypeTest()
         {
-            // TODO unit test for the property 'FirstName'
+            // TODO unit test for the property 'Type'
         }
 
         /// <summary>
@@ -92,12 +92,12 @@ public void LastNameTest()
         }
 
         /// <summary>
-        /// Test the property 'Type'
+        /// Test the property 'FirstName'
         /// </summary>
         [Fact]
-        public void TypeTest()
+        public void FirstNameTest()
         {
-            // TODO unit test for the property 'Type'
+            // TODO unit test for the property 'FirstName'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 00017fc42140..d68f587f1033 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateTime> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default;
-            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
             Client.Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default;
+            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersRequestEnumFormString> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 01ef5de875ec..1f1d7f6c4576 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 0cabe51ed289..1e36a4956043 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateTime> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default;
+            Client.Option<string> enumHeaderString = default;
             Client.Option<List<string>> enumQueryStringArray = default;
-            Client.Option<double> enumQueryDouble = default;
+            Client.Option<string> enumQueryString = default;
             Client.Option<int> enumQueryInteger = default;
+            Client.Option<double> enumQueryDouble = default;
             Client.Option<List<string>> enumFormStringArray = default;
-            Client.Option<string> enumHeaderString = default;
-            Client.Option<string> enumQueryString = default;
             Client.Option<string> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index c5e6e7e2f9d2..215e88093797 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
index 17720f6e735f..10c2f96d3a20 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
@@ -54,21 +54,21 @@ public void ChildInstanceTest()
         }
 
         /// <summary>
-        /// Test the property 'Age'
+        /// Test the property 'BoosterSeat'
         /// </summary>
         [Fact]
-        public void AgeTest()
+        public void BoosterSeatTest()
         {
-            // TODO unit test for the property 'Age'
+            // TODO unit test for the property 'BoosterSeat'
         }
 
         /// <summary>
-        /// Test the property 'BoosterSeat'
+        /// Test the property 'Age'
         /// </summary>
         [Fact]
-        public void BoosterSeatTest()
+        public void AgeTest()
         {
-            // TODO unit test for the property 'BoosterSeat'
+            // TODO unit test for the property 'Age'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
index aa3fc482188d..93161acf9fe6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
@@ -74,12 +74,12 @@ public void ChildDeserializeFromPersonTest()
         }
 
         /// <summary>
-        /// Test the property 'FirstName'
+        /// Test the property 'Type'
         /// </summary>
         [Fact]
-        public void FirstNameTest()
+        public void TypeTest()
         {
-            // TODO unit test for the property 'FirstName'
+            // TODO unit test for the property 'Type'
         }
 
         /// <summary>
@@ -92,12 +92,12 @@ public void LastNameTest()
         }
 
         /// <summary>
-        /// Test the property 'Type'
+        /// Test the property 'FirstName'
         /// </summary>
         [Fact]
-        public void TypeTest()
+        public void FirstNameTest()
         {
-            // TODO unit test for the property 'Type'
+            // TODO unit test for the property 'FirstName'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 00017fc42140..d68f587f1033 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateTime> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default;
-            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
             Client.Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default;
+            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersRequestEnumFormString> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 01ef5de875ec..1f1d7f6c4576 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 0cabe51ed289..1e36a4956043 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateTime> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default;
+            Client.Option<string> enumHeaderString = default;
             Client.Option<List<string>> enumQueryStringArray = default;
-            Client.Option<double> enumQueryDouble = default;
+            Client.Option<string> enumQueryString = default;
             Client.Option<int> enumQueryInteger = default;
+            Client.Option<double> enumQueryDouble = default;
             Client.Option<List<string>> enumFormStringArray = default;
-            Client.Option<string> enumHeaderString = default;
-            Client.Option<string> enumQueryString = default;
             Client.Option<string> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index c5e6e7e2f9d2..215e88093797 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
index 17720f6e735f..10c2f96d3a20 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs
@@ -54,21 +54,21 @@ public void ChildInstanceTest()
         }
 
         /// <summary>
-        /// Test the property 'Age'
+        /// Test the property 'BoosterSeat'
         /// </summary>
         [Fact]
-        public void AgeTest()
+        public void BoosterSeatTest()
         {
-            // TODO unit test for the property 'Age'
+            // TODO unit test for the property 'BoosterSeat'
         }
 
         /// <summary>
-        /// Test the property 'BoosterSeat'
+        /// Test the property 'Age'
         /// </summary>
         [Fact]
-        public void BoosterSeatTest()
+        public void AgeTest()
         {
-            // TODO unit test for the property 'BoosterSeat'
+            // TODO unit test for the property 'Age'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
index aa3fc482188d..93161acf9fe6 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs
@@ -74,12 +74,12 @@ public void ChildDeserializeFromPersonTest()
         }
 
         /// <summary>
-        /// Test the property 'FirstName'
+        /// Test the property 'Type'
         /// </summary>
         [Fact]
-        public void FirstNameTest()
+        public void TypeTest()
         {
-            // TODO unit test for the property 'FirstName'
+            // TODO unit test for the property 'Type'
         }
 
         /// <summary>
@@ -92,12 +92,12 @@ public void LastNameTest()
         }
 
         /// <summary>
-        /// Test the property 'Type'
+        /// Test the property 'FirstName'
         /// </summary>
         [Fact]
-        public void TypeTest()
+        public void FirstNameTest()
         {
-            // TODO unit test for the property 'Type'
+            // TODO unit test for the property 'FirstName'
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 86a438a3ec9b..a5b062bdc1e7 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateOnly> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateOnly> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
-            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default;
             Client.Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default;
-            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
             Client.Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default;
+            Client.Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default;
+            Client.Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default;
             Client.Option<TestEnumParametersRequestEnumFormString> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumQueryDouble, enumQueryInteger, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 01ef5de875ec..1f1d7f6c4576 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index fba8b26855ce..dc2ebc540c3b 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default!;
             string query = default!;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default!;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default!;
             decimal number = default!;
             double varDouble = default!;
             string patternWithoutDelimiter = default!;
-            Client.Option<DateOnly> date = default!;
-            Client.Option<System.IO.Stream> binary = default!;
-            Client.Option<float> varFloat = default!;
+            byte[] varByte = default!;
             Client.Option<int> integer = default!;
             Client.Option<int> int32 = default!;
             Client.Option<long> int64 = default!;
+            Client.Option<float> varFloat = default!;
             Client.Option<string> varString = default!;
+            Client.Option<System.IO.Stream> binary = default!;
+            Client.Option<DateOnly> date = default!;
+            Client.Option<DateTime> dateTime = default!;
             Client.Option<string> password = default!;
             Client.Option<string> callback = default!;
-            Client.Option<DateTime> dateTime = default!;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default!;
+            Client.Option<string> enumHeaderString = default!;
             Client.Option<List<string>> enumQueryStringArray = default!;
-            Client.Option<double> enumQueryDouble = default!;
+            Client.Option<string> enumQueryString = default!;
             Client.Option<int> enumQueryInteger = default!;
+            Client.Option<double> enumQueryDouble = default!;
             Client.Option<List<string>> enumFormStringArray = default!;
-            Client.Option<string> enumHeaderString = default!;
-            Client.Option<string> enumQueryString = default!;
             Client.Option<string> enumFormString = default!;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default!;
             int requiredStringGroup = default!;
+            bool requiredBooleanGroup = default!;
             long requiredInt64Group = default!;
-            Client.Option<bool> booleanGroup = default!;
             Client.Option<int> stringGroup = default!;
+            Client.Option<bool> booleanGroup = default!;
             Client.Option<long> int64Group = default!;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index caca49e64041..49e7b21b53c2 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default!;
-            Client.Option<System.IO.Stream> file = default!;
             Client.Option<string> additionalMetadata = default!;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default!;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default!;
             long petId = default!;
+            System.IO.Stream requiredFile = default!;
             Client.Option<string> additionalMetadata = default!;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 8cee721cf546..8e2c7255cda5 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default!;
             string username = default!;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default!;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 73bf47831d1c..6b89cca478f6 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateOnly> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateOnly> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default;
+            Client.Option<string> enumHeaderString = default;
             Client.Option<List<string>> enumQueryStringArray = default;
-            Client.Option<double> enumQueryDouble = default;
+            Client.Option<string> enumQueryString = default;
             Client.Option<int> enumQueryInteger = default;
+            Client.Option<double> enumQueryDouble = default;
             Client.Option<List<string>> enumFormStringArray = default;
-            Client.Option<string> enumHeaderString = default;
-            Client.Option<string> enumQueryString = default;
             Client.Option<string> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index c5e6e7e2f9d2..215e88093797 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index fba8b26855ce..dc2ebc540c3b 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default!;
             string query = default!;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default!;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default!;
             decimal number = default!;
             double varDouble = default!;
             string patternWithoutDelimiter = default!;
-            Client.Option<DateOnly> date = default!;
-            Client.Option<System.IO.Stream> binary = default!;
-            Client.Option<float> varFloat = default!;
+            byte[] varByte = default!;
             Client.Option<int> integer = default!;
             Client.Option<int> int32 = default!;
             Client.Option<long> int64 = default!;
+            Client.Option<float> varFloat = default!;
             Client.Option<string> varString = default!;
+            Client.Option<System.IO.Stream> binary = default!;
+            Client.Option<DateOnly> date = default!;
+            Client.Option<DateTime> dateTime = default!;
             Client.Option<string> password = default!;
             Client.Option<string> callback = default!;
-            Client.Option<DateTime> dateTime = default!;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default!;
+            Client.Option<string> enumHeaderString = default!;
             Client.Option<List<string>> enumQueryStringArray = default!;
-            Client.Option<double> enumQueryDouble = default!;
+            Client.Option<string> enumQueryString = default!;
             Client.Option<int> enumQueryInteger = default!;
+            Client.Option<double> enumQueryDouble = default!;
             Client.Option<List<string>> enumFormStringArray = default!;
-            Client.Option<string> enumHeaderString = default!;
-            Client.Option<string> enumQueryString = default!;
             Client.Option<string> enumFormString = default!;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default!;
             int requiredStringGroup = default!;
+            bool requiredBooleanGroup = default!;
             long requiredInt64Group = default!;
-            Client.Option<bool> booleanGroup = default!;
             Client.Option<int> stringGroup = default!;
+            Client.Option<bool> booleanGroup = default!;
             Client.Option<long> int64Group = default!;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index caca49e64041..49e7b21b53c2 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default!;
-            Client.Option<System.IO.Stream> file = default!;
             Client.Option<string> additionalMetadata = default!;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default!;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default!;
             long petId = default!;
+            System.IO.Stream requiredFile = default!;
             Client.Option<string> additionalMetadata = default!;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 8cee721cf546..8e2c7255cda5 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default!;
             string username = default!;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default!;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 0cabe51ed289..1e36a4956043 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -169,9 +169,9 @@ public async Task TestBodyWithFileSchemaAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestBodyWithQueryParamsAsyncTest()
         {
-            User user = default;
             string query = default;
-            await _instance.TestBodyWithQueryParamsAsync(user, query);
+            User user = default;
+            await _instance.TestBodyWithQueryParamsAsync(query, user);
         }
 
         /// <summary>
@@ -192,21 +192,21 @@ public async Task TestClientModelAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestEndpointParametersAsyncTest()
         {
-            byte[] varByte = default;
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
-            Client.Option<System.IO.Stream> binary = default;
-            Client.Option<float> varFloat = default;
+            byte[] varByte = default;
             Client.Option<int> integer = default;
             Client.Option<int> int32 = default;
             Client.Option<long> int64 = default;
+            Client.Option<float> varFloat = default;
             Client.Option<string> varString = default;
+            Client.Option<System.IO.Stream> binary = default;
+            Client.Option<DateTime> date = default;
+            Client.Option<DateTime> dateTime = default;
             Client.Option<string> password = default;
             Client.Option<string> callback = default;
-            Client.Option<DateTime> dateTime = default;
-            await _instance.TestEndpointParametersAsync(varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
+            await _instance.TestEndpointParametersAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
 
         /// <summary>
@@ -216,14 +216,14 @@ public async Task TestEndpointParametersAsyncTest()
         public async Task TestEnumParametersAsyncTest()
         {
             Client.Option<List<string>> enumHeaderStringArray = default;
+            Client.Option<string> enumHeaderString = default;
             Client.Option<List<string>> enumQueryStringArray = default;
-            Client.Option<double> enumQueryDouble = default;
+            Client.Option<string> enumQueryString = default;
             Client.Option<int> enumQueryInteger = default;
+            Client.Option<double> enumQueryDouble = default;
             Client.Option<List<string>> enumFormStringArray = default;
-            Client.Option<string> enumHeaderString = default;
-            Client.Option<string> enumQueryString = default;
             Client.Option<string> enumFormString = default;
-            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            await _instance.TestEnumParametersAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -232,13 +232,13 @@ public async Task TestEnumParametersAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task TestGroupParametersAsyncTest()
         {
-            bool requiredBooleanGroup = default;
             int requiredStringGroup = default;
+            bool requiredBooleanGroup = default;
             long requiredInt64Group = default;
-            Client.Option<bool> booleanGroup = default;
             Client.Option<int> stringGroup = default;
+            Client.Option<bool> booleanGroup = default;
             Client.Option<long> int64Group = default;
-            await _instance.TestGroupParametersAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            await _instance.TestGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index c5e6e7e2f9d2..215e88093797 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -136,9 +136,9 @@ public async Task UpdatePetWithFormAsyncTest()
         public async Task UploadFileAsyncTest()
         {
             long petId = default;
-            Client.Option<System.IO.Stream> file = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileAsync(petId, file, additionalMetadata);
+            Client.Option<System.IO.Stream> file = default;
+            var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
@@ -149,10 +149,10 @@ public async Task UploadFileAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UploadFileWithRequiredFileAsyncTest()
         {
-            System.IO.Stream requiredFile = default;
             long petId = default;
+            System.IO.Stream requiredFile = default;
             Client.Option<string> additionalMetadata = default;
-            var response = await _instance.UploadFileWithRequiredFileAsync(requiredFile, petId, additionalMetadata);
+            var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
             Assert.IsType<ApiResponse>(model);
         }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 38ee1125438a..fba6a6f085fc 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -130,9 +130,9 @@ public async Task LogoutUserAsyncTest()
         [Fact (Skip = "not implemented")]
         public async Task UpdateUserAsyncTest()
         {
-            User user = default;
             string username = default;
-            await _instance.UpdateUserAsync(user, username);
+            User user = default;
+            await _instance.UpdateUserAsync(username, user);
         }
     }
 }

From 7027a402e8a40affdd31fb91a9c1a18eec3198ef Mon Sep 17 00:00:00 2001
From: devhl <shawnkanyer@gmail.com>
Date: Mon, 5 Aug 2024 18:48:05 -0400
Subject: [PATCH 4/4] build samples

---
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Person.cs   | 16 ++++++++--------
 .../src/Org.OpenAPITools/Api/FakeApi.cs          |  4 ----
 .../Petstore/src/Org.OpenAPITools/Api/FakeApi.cs |  8 ++++----
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Person.cs   | 16 ++++++++--------
 .../src/Org.OpenAPITools/Api/FakeApi.cs          |  4 ----
 .../Petstore/src/Org.OpenAPITools/Api/FakeApi.cs |  8 ++++----
 .../AllOf/src/Org.OpenAPITools/Model/Adult.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Child.cs    |  9 +--------
 .../AllOf/src/Org.OpenAPITools/Model/Person.cs   | 16 ++++++++--------
 .../src/Org.OpenAPITools/Api/FakeApi.cs          |  4 ----
 .../src/Org.OpenAPITools/Api/FakeApi.cs          |  8 ++++----
 .../Petstore/src/Org.OpenAPITools/Api/FakeApi.cs |  8 ++++----
 .../src/Org.OpenAPITools/Api/FakeApi.cs          |  8 ++++----
 .../Petstore/src/Org.OpenAPITools/Api/FakeApi.cs |  8 ++++----
 18 files changed, 54 insertions(+), 108 deletions(-)

diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 9c0faafd5106..6a1524a06c42 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -48,7 +48,7 @@ public Adult(Option<string> lastName = default, Option<string> firstName = defau
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Adult";
 
         /// <summary>
@@ -64,13 +64,6 @@ public Adult(Option<string> lastName = default, Option<string> firstName = defau
         [JsonPropertyName("children")]
         public List<Child> Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new Option<List<Child>>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 6f3c0744f7fe..297e85e76f1e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -50,7 +50,7 @@ public Child(Option<string> lastName = default, Option<string> firstName = defau
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Child";
 
         /// <summary>
@@ -66,13 +66,6 @@ public Child(Option<string> lastName = default, Option<string> firstName = defau
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new Option<int?>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
index 2681331f25d5..7240795850e4 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -49,13 +49,7 @@ public Person(Option<string> lastName = default, Option<string> firstName = defa
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -75,7 +69,13 @@ public Person(Option<string> lastName = default, Option<string> firstName = defa
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index a4c5a747f040..8a66cf923341 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4286,14 +4286,10 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryString.IsSet)
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
                     if (enumQueryDouble.IsSet)
-                        // here too
                         parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index 8d52cb3f8b62..90610642b72e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4295,14 +4295,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 9c0faafd5106..6a1524a06c42 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -48,7 +48,7 @@ public Adult(Option<string> lastName = default, Option<string> firstName = defau
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Adult";
 
         /// <summary>
@@ -64,13 +64,6 @@ public Adult(Option<string> lastName = default, Option<string> firstName = defau
         [JsonPropertyName("children")]
         public List<Child> Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new Option<List<Child>>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 6f3c0744f7fe..297e85e76f1e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -50,7 +50,7 @@ public Child(Option<string> lastName = default, Option<string> firstName = defau
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Child";
 
         /// <summary>
@@ -66,13 +66,6 @@ public Child(Option<string> lastName = default, Option<string> firstName = defau
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new Option<int?>(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
index 2681331f25d5..7240795850e4 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -49,13 +49,7 @@ public Person(Option<string> lastName = default, Option<string> firstName = defa
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -75,7 +69,13 @@ public Person(Option<string> lastName = default, Option<string> firstName = defa
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new Option<string>(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index a4c5a747f040..8a66cf923341 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4286,14 +4286,10 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryString.IsSet)
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
                     if (enumQueryDouble.IsSet)
-                        // here too
                         parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index 8d52cb3f8b62..90610642b72e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4295,14 +4295,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
index 52809f1581bd..3317131eb563 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs
@@ -50,7 +50,7 @@ public Adult(Option<string?> lastName = default, Option<string?> firstName = def
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Adult";
 
         /// <summary>
@@ -66,13 +66,6 @@ public Adult(Option<string?> lastName = default, Option<string?> firstName = def
         [JsonPropertyName("children")]
         public List<Child>? Children { get { return this.ChildrenOption; } set { this.ChildrenOption = new(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Adult";
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
index 940ff6c555d5..7df3b3a9f872 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs
@@ -52,7 +52,7 @@ public Child(Option<string?> lastName = default, Option<string?> firstName = def
         /// The discriminator
         /// </summary>
         [JsonIgnore]
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         public new string Type { get; } = "Child";
 
         /// <summary>
@@ -68,13 +68,6 @@ public Child(Option<string?> lastName = default, Option<string?> firstName = def
         [JsonPropertyName("age")]
         public int? Age { get { return this.AgeOption; } set { this.AgeOption = new(value); } }
 
-        /// <summary>
-        /// The discriminator
-        /// </summary>
-        [JsonIgnore]
-        [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public new string Type { get; } = "Child";
-
         /// <summary>
         /// Used to track the state of BoosterSeat
         /// </summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
index dd6eee0937cb..4448ccdadb7a 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs
@@ -51,13 +51,7 @@ public Person(Option<string?> lastName = default, Option<string?> firstName = de
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<string?> FirstNameOption { get; private set; }
-
-        /// <summary>
-        /// Gets or Sets FirstName
-        /// </summary>
-        [JsonPropertyName("firstName")]
-        public string? FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new(value); } }
+        public string Type { get; } = "Person";
 
         /// <summary>
         /// Used to track the state of LastName
@@ -77,7 +71,13 @@ public Person(Option<string?> lastName = default, Option<string?> firstName = de
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public string Type { get; } = "Person";
+        public Option<string?> FirstNameOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FirstName
+        /// </summary>
+        [JsonPropertyName("firstName")]
+        public string? FirstName { get { return this.FirstNameOption; } set { this.FirstNameOption = new(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 8559016cadf6..037a370a9078 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4295,14 +4295,10 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryString.IsSet)
                         parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
-
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
                     if (enumQueryDouble.IsSet)
-                        // here too
                         parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
index 02e5fc2ca016..d543e62f6c5c 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4306,14 +4306,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index ade241d3ffe2..aef1593c210e 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4304,14 +4304,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
index 02e5fc2ca016..d543e62f6c5c 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4306,14 +4306,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();
 
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index 2a3159a2e708..ea0880be652c 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -4294,14 +4294,14 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
                     if (enumQueryStringArray.IsSet)
                         parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);
 
-                    if (enumQueryDouble.IsSet)
-                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
+                    if (enumQueryString.IsSet)
+                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
 
                     if (enumQueryInteger.IsSet)
                         parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);
 
-                    if (enumQueryString.IsSet)
-                        parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);
+                    if (enumQueryDouble.IsSet)
+                        parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);
 
                     uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();